errno.h inclusion conditionally done in setup_once.h

curl · Jul 24, 2011 · ef21761 · ef21761
1 parent 27b8814
commit ef21761
Show file tree

Hide file tree

Showing 33 changed files with 34 additions and 21 deletions.
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
@@ -498,6 +498,7 @@ endif
 	@echo $(DL)#define USE_MANUAL 1$(DL) >> $@
 	@echo $(DL)#define HAVE_ARPA_INET_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_ERRNO_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_ERR_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_GETHOSTBYADDR 1$(DL) >> $@

diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
@@ -23,7 +23,6 @@
 #include "setup.h"
 
 #include <string.h>
-#include <errno.h>
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>

diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -26,6 +26,7 @@
 
 #define HAVE_ARPA_INET_H 1
 #define HAVE_CLOSESOCKET_CAMEL 1
+#define HAVE_ERRNO_H 1
 #define HAVE_GETHOSTBYADDR 1
 #define HAVE_INET_ADDR 1
 #define HAVE_INTTYPES_H 1

diff --git a/lib/config-dos.h b/lib/config-dos.h
@@ -40,6 +40,7 @@
 #define PACKAGE  "curl"
 
 #define HAVE_ARPA_INET_H       1
+#define HAVE_ERRNO_H           1
 #define HAVE_FCNTL_H           1
 #define HAVE_GETADDRINFO       1
 #define HAVE_GETNAMEINFO       1

diff --git a/lib/config-mac.h b/lib/config-mac.h
@@ -30,6 +30,7 @@
 
 #define OS "mac"
 
+#define HAVE_ERRNO_H            1
 #define HAVE_NETINET_IN_H       1
 #define HAVE_SYS_SOCKET_H       1
 #define HAVE_SYS_SELECT_H       1

diff --git a/lib/config-os400.h b/lib/config-os400.h
@@ -97,6 +97,9 @@
 /* Define if you have the <des.h> header file. */
 #undef HAVE_DES_H
 
+/* Define if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H
+
 /* Define if you have the <err.h> header file. */
 #undef HAVE_ERR_H
 

diff --git a/lib/config-riscos.h b/lib/config-riscos.h
@@ -92,6 +92,9 @@
 /* Define if you have the <des.h> header file. */
 #undef HAVE_DES_H
 
+/* Define if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H
+
 /* Define if you have the <err.h> header file. */
 #undef HAVE_ERR_H
 

diff --git a/lib/config-vms.h b/lib/config-vms.h
@@ -143,6 +143,9 @@
 /* Define if you have the uname function.  */
 #define HAVE_UNAME 1
 
+/* Define if you have the <errno.h> header file.  */
+#define HAVE_ERRNO_H 1
+
 /* Define if you have the <err.h> header file.  */
 #define HAVE_ERR_H 1
 

diff --git a/lib/config-win32.h b/lib/config-win32.h
@@ -39,6 +39,9 @@
 /* Define if you have the <crypto.h> header file.  */
 /* #define HAVE_CRYPTO_H 1 */
 
+/* Define if you have the <errno.h> header file.  */
+#define HAVE_ERRNO_H 1
+
 /* Define if you have the <err.h> header file.  */
 /* #define HAVE_ERR_H 1 */
 

diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
@@ -39,6 +39,9 @@
 /* Define if you have the <crypto.h> header file.  */
 /* #define HAVE_CRYPTO_H 1 */
 
+/* Define if you have the <errno.h> header file.  */
+#define HAVE_ERRNO_H 1
+
 /* Define if you have the <err.h> header file.  */
 /* #define HAVE_ERR_H 1 */
 

diff --git a/lib/connect.c b/lib/connect.c
@@ -69,7 +69,6 @@
 #endif
 
 #include <stdio.h>
-#include <errno.h>
 #include <string.h>
 
 #define _MPRINTF_REPLACE /* use our functions only */

diff --git a/lib/easy.c b/lib/easy.c
@@ -28,7 +28,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <errno.h>
 
 #include "strequal.h"
 

diff --git a/lib/hostip4.c b/lib/hostip4.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -23,7 +23,6 @@
 #include "setup.h"
 
 #include <string.h>
-#include <errno.h>
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>

diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c
@@ -49,7 +49,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>
-#include <errno.h>
 #endif
 
 #if (defined(NETWARE) && !defined(__NOVELL_LIBC__))

diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c
@@ -35,7 +35,6 @@
 #include <arpa/inet.h>
 #endif
 #include <string.h>
-#include <errno.h>
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>

diff --git a/lib/inet_pton.c b/lib/inet_pton.c
@@ -33,7 +33,6 @@
 #include <arpa/inet.h>
 #endif
 #include <string.h>
-#include <errno.h>
 
 #include "inet_pton.h"
 

diff --git a/lib/ldap.c b/lib/ldap.c
@@ -41,7 +41,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <errno.h>
 
 #ifdef CURL_LDAP_WIN            /* Use Windows LDAP implementation. */
 # include <winldap.h>

diff --git a/lib/qssl.c b/lib/qssl.c
@@ -24,7 +24,6 @@
 
 #ifdef USE_QSOSSL
 #include <qsossl.h>
-#include <errno.h>
 #include <string.h>
 #ifdef HAVE_LIMITS_H
 #  include <limits.h>

diff --git a/lib/sendf.c b/lib/sendf.c
@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <errno.h>
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h> /* required for send() & recv() prototypes */

diff --git a/lib/setup.h b/lib/setup.h
@@ -279,7 +279,6 @@
 #ifdef HAVE_ASSERT_H
 #include <assert.h>
 #endif
-#include <errno.h>
 
 #ifdef __TANDEM /* for nsr-tandem-nsk systems */
 #include <floss.h>

diff --git a/lib/setup_once.h b/lib/setup_once.h
@@ -42,7 +42,10 @@
 #include <string.h>
 #include <stdarg.h>
 #include <ctype.h>
+
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/lib/strerror.c b/lib/strerror.c
@@ -36,7 +36,6 @@
 #include <curl/curl.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 
 #ifdef USE_LIBIDN
 #include <idna.h>

diff --git a/lib/strtoofft.c b/lib/strtoofft.c
@@ -34,7 +34,6 @@
 #ifdef NEED_CURL_STRTOLL
 #include <stdlib.h>
 #include <ctype.h>
-#include <errno.h>
 
 /* Range tests can be used for alphanum decoding if characters are consecutive,
    like in ASCII. Else an array is scanned. Determine this condition now. */

diff --git a/lib/transfer.c b/lib/transfer.c
@@ -28,7 +28,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <errno.h>
 
 #include "strtoofft.h"
 #include "strequal.h"

diff --git a/lib/url.c b/lib/url.c
@@ -29,7 +29,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <errno.h>
 
 #ifdef WIN32
 #include <time.h>

diff --git a/src/Makefile.netware b/src/Makefile.netware
@@ -491,6 +491,7 @@ endif
 	@echo $(DL)#define USE_MANUAL 1$(DL) >> $@
 	@echo $(DL)#define HAVE_ARPA_INET_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_ERRNO_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_ERR_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_GETHOSTBYADDR 1$(DL) >> $@

diff --git a/src/config-amigaos.h b/src/config-amigaos.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -30,6 +30,7 @@
 #define OS "AmigaOS"
 
 #define HAVE_CLOSESOCKET_CAMEL  1
+#define HAVE_ERRNO_H            1
 #define HAVE_UNISTD_H           1
 #define HAVE_STRDUP             1
 #define HAVE_UTIME              1

diff --git a/src/config-mac.h b/src/config-mac.h
@@ -32,6 +32,7 @@
 #define USE_MANUAL 1
 
 #define HAVE_UNISTD_H           1
+#define HAVE_ERRNO_H            1
 #define HAVE_FCNTL_H            1
 #define HAVE_UTIME_H            1
 #define HAVE_SYS_UTIME_H        1

diff --git a/src/config-riscos.h b/src/config-riscos.h
@@ -91,6 +91,9 @@
 /* Define if you have the <des.h> header file. */
 #undef HAVE_DES_H
 
+/* Define if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H
+
 /* Define if you have the <err.h> header file. */
 #undef HAVE_ERR_H
 

diff --git a/src/config-win32.h b/src/config-win32.h
@@ -30,6 +30,9 @@
 /*                          HEADER FILES                            */
 /* ---------------------------------------------------------------- */
 
+/* Define if you have the <errno.h> header file.  */
+#define HAVE_ERRNO_H 1
+
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H 1
 

diff --git a/src/main.c b/src/main.c
@@ -34,7 +34,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
-#include <errno.h>
 
 #if defined(MSDOS) || defined(WIN32)
 #  if defined(HAVE_LIBGEN_H) && defined(HAVE_BASENAME)

diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c
@@ -22,7 +22,6 @@
 #include "test.h"
 #include <stdlib.h>
 #include <ctype.h>
-#include <errno.h>
 
 #include <curl/mprintf.h>
 

diff --git a/tests/libtest/test.h b/tests/libtest/test.h
@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <errno.h>
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>