aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2012-04-06 23:35:15 +0200
committerYang Tse <yangsita@gmail.com>2012-04-06 23:37:05 +0200
commit919c97fa65a5c00f7044e849eeb0095408413505 (patch)
tree12b5005946b744b178cf1fecd310941074cffa45
parent376b4d48feea9da98eda15ddf05c86729d9dc3f1 (diff)
curl tool: use configuration files from lib directory
Configuration files such as curl_config.h and all config-*.h no longer exist nor are generated/copied into 'src' directory, now these only exist in 'lib' directory from where curl tool sources uses them. Additionally old src/setup.h has been refactored into src/tool_setup.h which now pulls lib/setup.h The possibility of a makefile needing an include path adjustment exists.
-rwxr-xr-xbuildconf5
-rw-r--r--configure.ac2
-rw-r--r--docs/INTERNALS6
-rw-r--r--include/curl/.gitignore1
-rw-r--r--lib/amigaos.c25
-rw-r--r--lib/amigaos.h40
-rw-r--r--lib/config-amigaos.h30
-rw-r--r--lib/config-mac.h23
-rw-r--r--lib/config-riscos.h30
-rw-r--r--lib/easy.c11
-rw-r--r--lib/setup.h22
-rwxr-xr-xmaketgz8
-rw-r--r--src/Makefile.am25
-rw-r--r--src/Makefile.inc4
-rw-r--r--src/Makefile.netware207
-rw-r--r--src/config-amigaos.h70
-rw-r--r--src/config-mac.h57
-rw-r--r--src/config-riscos.h402
-rw-r--r--src/hugehelp.c.cvs2
-rw-r--r--src/hugehelp.h4
-rw-r--r--src/makefile.dj12
-rw-r--r--src/setup.h296
-rw-r--r--src/tool_binmode.c4
-rw-r--r--src/tool_binmode.h4
-rw-r--r--src/tool_bname.c4
-rw-r--r--src/tool_bname.h4
-rw-r--r--src/tool_cb_dbg.c4
-rw-r--r--src/tool_cb_dbg.h4
-rw-r--r--src/tool_cb_hdr.c4
-rw-r--r--src/tool_cb_hdr.h4
-rw-r--r--src/tool_cb_prg.c4
-rw-r--r--src/tool_cb_prg.h4
-rw-r--r--src/tool_cb_rea.c4
-rw-r--r--src/tool_cb_rea.h4
-rw-r--r--src/tool_cb_see.c4
-rw-r--r--src/tool_cb_see.h4
-rw-r--r--src/tool_cb_wrt.c4
-rw-r--r--src/tool_cb_wrt.h4
-rw-r--r--src/tool_cfgable.c4
-rw-r--r--src/tool_cfgable.h2
-rw-r--r--src/tool_convert.c4
-rw-r--r--src/tool_convert.h4
-rw-r--r--src/tool_dirhie.c4
-rw-r--r--src/tool_dirhie.h4
-rw-r--r--src/tool_doswin.c4
-rw-r--r--src/tool_doswin.h4
-rw-r--r--src/tool_easysrc.c2
-rw-r--r--src/tool_easysrc.h2
-rw-r--r--src/tool_formparse.c2
-rw-r--r--src/tool_formparse.h4
-rw-r--r--src/tool_getparam.c2
-rw-r--r--src/tool_getparam.h4
-rw-r--r--src/tool_getpass.c4
-rw-r--r--src/tool_getpass.h4
-rw-r--r--src/tool_help.c2
-rw-r--r--src/tool_help.h4
-rw-r--r--src/tool_helpers.c4
-rw-r--r--src/tool_helpers.h4
-rw-r--r--src/tool_homedir.c4
-rw-r--r--src/tool_homedir.h4
-rw-r--r--src/tool_libinfo.c4
-rw-r--r--src/tool_libinfo.h4
-rw-r--r--src/tool_main.c4
-rw-r--r--src/tool_main.h4
-rw-r--r--src/tool_mfiles.c4
-rw-r--r--src/tool_mfiles.h4
-rw-r--r--src/tool_msgs.c4
-rw-r--r--src/tool_msgs.h4
-rw-r--r--src/tool_operate.c2
-rw-r--r--src/tool_operate.h4
-rw-r--r--src/tool_operhlp.c4
-rw-r--r--src/tool_operhlp.h4
-rw-r--r--src/tool_panykey.c4
-rw-r--r--src/tool_panykey.h4
-rw-r--r--src/tool_paramhlp.c4
-rw-r--r--src/tool_paramhlp.h4
-rw-r--r--src/tool_parsecfg.c4
-rw-r--r--src/tool_parsecfg.h4
-rw-r--r--src/tool_sdecls.h4
-rw-r--r--src/tool_setopt.c2
-rw-r--r--src/tool_setopt.h2
-rw-r--r--src/tool_setup.h56
-rw-r--r--src/tool_sleep.c4
-rw-r--r--src/tool_sleep.h4
-rw-r--r--src/tool_urlglob.c4
-rw-r--r--src/tool_urlglob.h4
-rw-r--r--src/tool_util.c4
-rw-r--r--src/tool_util.h4
-rw-r--r--src/tool_vms.c4
-rw-r--r--src/tool_vms.h4
-rw-r--r--src/tool_writeenv.c4
-rw-r--r--src/tool_writeenv.h4
-rw-r--r--src/tool_writeout.c4
-rw-r--r--src/tool_writeout.h4
-rw-r--r--src/tool_xattr.c4
-rw-r--r--src/tool_xattr.h4
-rw-r--r--src/vc6curlsrc.dsp8
97 files changed, 324 insertions, 1296 deletions
diff --git a/buildconf b/buildconf
index da596faef..a7eb51a12 100755
--- a/buildconf
+++ b/buildconf
@@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2012, 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
@@ -384,9 +384,6 @@ $PERL -i.bak -pe 's/\bmv +([^-\s])/mv -f $1/g' aclocal.m4
echo "buildconf: running autoheader"
${AUTOHEADER:-autoheader} || die "autoheader command failed"
-echo "buildconf: cp lib/curl_config.h.in src/curl_config.h.in"
-cp lib/curl_config.h.in src/curl_config.h.in
-
echo "buildconf: running autoconf"
${AUTOCONF:-autoconf} || die "autoconf command failed"
diff --git a/configure.ac b/configure.ac
index 7feb364a9..81521ff29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ This configure script may be copied, distributed and modified under the
terms of the curl license; see COPYING for more details])
AC_CONFIG_SRCDIR([lib/urldata.h])
-AM_CONFIG_HEADER(lib/curl_config.h src/curl_config.h include/curl/curlbuild.h)
+AM_CONFIG_HEADER(lib/curl_config.h include/curl/curlbuild.h)
AC_CONFIG_MACRO_DIR([m4])
AM_MAINTAINER_MODE
diff --git a/docs/INTERNALS b/docs/INTERNALS
index 39c4df720..b87e2ce20 100644
--- a/docs/INTERNALS
+++ b/docs/INTERNALS
@@ -104,9 +104,9 @@ Windows vs Unix
Inside the source code, We make an effort to avoid '#ifdef [Your OS]'. All
conditionals that deal with features *should* instead be in the format
'#ifdef HAVE_THAT_WEIRD_FUNCTION'. Since Windows can't run configure scripts,
- we maintain two curl_config-win32.h files (one in lib/ and one in src/) that
- are supposed to look exactly as a curl_config.h file would have looked like on
- a Windows machine!
+ we maintain a curl_config-win32.h file in lib directory that is supposed to
+ look exactly as a curl_config.h file would have looked like on a Windows
+ machine!
Generally speaking: always remember that this will be compiled on dozens of
operating systems. Don't walk on the edge.
diff --git a/include/curl/.gitignore b/include/curl/.gitignore
index bfd4bca20..8adbe4118 100644
--- a/include/curl/.gitignore
+++ b/include/curl/.gitignore
@@ -1,3 +1,4 @@
curlbuild.h
+stamp-h2
stamp-h3
curlver.h.dist
diff --git a/lib/amigaos.c b/lib/amigaos.c
index 2055126fe..71ea704e1 100644
--- a/lib/amigaos.c
+++ b/lib/amigaos.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -20,11 +20,14 @@
*
***************************************************************************/
-#ifdef __AMIGA__ /* Any AmigaOS flavour */
+#include "setup.h"
+
+#if defined(__AMIGA__) && !defined(__ixemul__)
-#include "amigaos.h"
#include <amitcp/socketbasetags.h>
+#include "amigaos.h"
+
struct Library *SocketBase = NULL;
extern int errno, h_errno;
@@ -35,7 +38,7 @@ void __request(const char *msg);
# define __request( msg ) Printf( msg "\n\a")
#endif
-void amiga_cleanup()
+void Curl_amiga_cleanup()
{
if(SocketBase) {
CloseLibrary(SocketBase);
@@ -43,7 +46,7 @@ void amiga_cleanup()
}
}
-BOOL amiga_init()
+bool Curl_amiga_init()
{
if(!SocketBase)
SocketBase = OpenLibrary("bsdsocket.library", 4);
@@ -61,20 +64,14 @@ BOOL amiga_init()
}
#ifndef __libnix__
- atexit(amiga_cleanup);
+ atexit(Curl_amiga_cleanup);
#endif
return TRUE;
}
#ifdef __libnix__
-ADD2EXIT(amiga_cleanup,-50);
-#endif
-
-#else /* __AMIGA__ */
-
-#ifdef __POCC__
-# pragma warn(disable:2024) /* Disable warning #2024: Empty input file */
+ADD2EXIT(Curl_amiga_cleanup,-50);
#endif
-#endif /* __AMIGA__ */
+#endif /* __AMIGA__ && ! __ixemul__ */
diff --git a/lib/amigaos.h b/lib/amigaos.h
index d6ff0646a..7476a13d8 100644
--- a/lib/amigaos.h
+++ b/lib/amigaos.h
@@ -1,5 +1,5 @@
-#ifndef LIBCURL_AMIGAOS_H
-#define LIBCURL_AMIGAOS_H
+#ifndef HEADER_CURL_AMIGAOS_H
+#define HEADER_CURL_AMIGAOS_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,37 +21,19 @@
* KIND, either express or implied.
*
***************************************************************************/
+#include "setup.h"
-#ifdef __AMIGA__ /* Any AmigaOS flavour */
+#if defined(__AMIGA__) && !defined(__ixemul__)
-#ifndef __ixemul__
+bool Curl_amiga_init();
+void Curl_amiga_cleanup();
-#include <exec/types.h>
-#include <exec/execbase.h>
+#else
-#include <proto/exec.h>
-#include <proto/dos.h>
+#define Curl_amiga_init() 1
+#define Curl_amiga_cleanup() Curl_nop_stmt
-#include <sys/socket.h>
-
-#include "config-amigaos.h"
-
-#ifndef select
-# define select(args...) WaitSelect( args, NULL)
-#endif
-#ifndef ioctl
-# define ioctl(a,b,c,d) IoctlSocket( (LONG)a, (ULONG)b, (char*)c)
#endif
-#define _AMIGASF 1
-
-extern void amiga_cleanup();
-extern BOOL amiga_init();
-
-#else /* __ixemul__ */
-
-#warning compiling with ixemul...
-#endif /* __ixemul__ */
-#endif /* __AMIGA__ */
-#endif /* LIBCURL_AMIGAOS_H */
+#endif /* HEADER_CURL_AMIGAOS_H */
diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h
index 1474ba915..76d887755 100644
--- a/lib/config-amigaos.h
+++ b/lib/config-amigaos.h
@@ -1,5 +1,5 @@
-#ifndef LIBCURL_CONFIG_AMIGAOS_H
-#define LIBCURL_CONFIG_AMIGAOS_H
+#ifndef HEADER_CURL_CONFIG_AMIGAOS_H
+#define HEADER_CURL_CONFIG_AMIGAOS_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -22,6 +22,10 @@
*
***************************************************************************/
+/* ================================================================ */
+/* Hand crafted config file for AmigaOS */
+/* ================================================================ */
+
#ifdef __AMIGA__ /* Any AmigaOS flavour */
#define HAVE_ARPA_INET_H 1
@@ -72,8 +76,6 @@
#define HAVE_SYS_STAT_H 1
#define HAVE_SYS_TIME_H 1
#define HAVE_SYS_TYPES_H 1
-#define HAVE_TERMIOS_H 1
-#define HAVE_TERMIO_H 1
#define HAVE_TIME_H 1
#define HAVE_UNAME 1
#define HAVE_UNISTD_H 1
@@ -89,11 +91,11 @@
#define SIZEOF_SHORT 2
#define SIZEOF_SIZE_T 4
+#define USE_MANUAL 1
#define USE_OPENSSL 1
#define USE_SSLEAY 1
#define CURL_DISABLE_LDAP 1
-
#define OS "AmigaOS"
#define PACKAGE "curl"
@@ -114,8 +116,20 @@
#define in_addr_t int
+#ifndef F_OK
+# define F_OK 0
+#endif
+
#ifndef O_RDONLY
-# define O_RDONLY 0x0000
+# define O_RDONLY 0x0000
+#endif
+
+#ifndef LONG_MAX
+# define LONG_MAX 0x7fffffffL
+#endif
+
+#ifndef LONG_MIN
+# define LONG_MIN (-0x7fffffffL-1)
#endif
#define HAVE_GETNAMEINFO 1
@@ -150,4 +164,4 @@
#define SEND_TYPE_RETV int
#endif /* __AMIGA__ */
-#endif /* LIBCURL_CONFIG_AMIGAOS_H */
+#endif /* HEADER_CURL_CONFIG_AMIGAOS_H */
diff --git a/lib/config-mac.h b/lib/config-mac.h
index 72e8260d1..d89c38515 100644
--- a/lib/config-mac.h
+++ b/lib/config-mac.h
@@ -1,5 +1,5 @@
-#ifndef __LIB_CONFIG_MAC_H
-#define __LIB_CONFIG_MAC_H
+#ifndef HEADER_CURL_CONFIG_MAC_H
+#define HEADER_CURL_CONFIG_MAC_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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,13 +23,16 @@
***************************************************************************/
/* =================================================================== */
-/* lib/config-mac.h - Hand crafted config file for Mac OS 9 */
+/* Hand crafted config file for Mac OS 9 */
/* =================================================================== */
/* On Mac OS X you must run configure to generate curl_config.h file */
/* =================================================================== */
#define OS "mac"
+/* Define if you want the built-in manual */
+#define USE_MANUAL 1
+
#define HAVE_ERRNO_H 1
#define HAVE_NETINET_IN_H 1
#define HAVE_SYS_SOCKET_H 1
@@ -43,15 +46,16 @@
#define HAVE_FCNTL_H 1
#define HAVE_SYS_STAT_H 1
#define HAVE_ALLOCA_H 1
-#define HAVE_TIME_H 1
#define HAVE_STDLIB_H 1
+#define HAVE_TIME_H 1
#define HAVE_UTIME_H 1
#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_UTIME_H 1
#define TIME_WITH_SYS_TIME 1
#define HAVE_ALARM 1
-#define HAVE_STRDUP 1
+#define HAVE_FTRUNCATE 1
#define HAVE_UTIME 1
#define HAVE_SETVBUF 1
#define HAVE_STRFTIME 1
@@ -61,14 +65,13 @@
#define HAVE_SOCKET 1
#define HAVE_STRUCT_TIMEVAL 1
-//#define HAVE_STRICMP 1
#define HAVE_SIGACTION 1
#define HAVE_SIGNAL_H 1
#define HAVE_SIG_ATOMIC_T 1
#ifdef MACOS_SSL_SUPPORT
-# define USE_SSLEAY 1
-# define USE_OPENSSL 1
+# define USE_SSLEAY 1
+# define USE_OPENSSL 1
#endif
#define CURL_DISABLE_LDAP 1
@@ -120,4 +123,4 @@
#define HAVE_EXTRA_STRICMP_H 1
#define HAVE_EXTRA_STRDUP_H 1
-#endif /* __LIB_CONFIG_MAC_H */
+#endif /* HEADER_CURL_CONFIG_MAC_H */
diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index 127dbdb0a..e2af9af6c 100644
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -1,11 +1,13 @@
-/* curl_config.h.in. Generated automatically from configure.in by autoheader. /***************************************************************************
+#ifndef HEADER_CURL_CONFIG_RISCOS_H
+#define HEADER_CURL_CONFIG_RISCOS_H
+/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +21,11 @@
* KIND, either express or implied.
*
***************************************************************************/
- */
+
+/* ================================================================ */
+/* Hand crafted config file for RISC OS */
+/* ================================================================ */
+
/* Name of this package! */
#undef PACKAGE
@@ -32,6 +38,9 @@
/* Define cpu-machine-OS */
#define OS "ARM-RISC OS"
+/* Define if you want the built-in manual */
+#define USE_MANUAL
+
/* Define if you have the gethostbyaddr_r() function with 5 arguments */
#undef HAVE_GETHOSTBYADDR_R_5
@@ -74,8 +83,8 @@
/* Define if you want to enable IPv6 support */
#undef ENABLE_IPV6
-/* Define to 1 if you have the alarm function. */
-#define HAVE_ALARM 1
+/* Define if you have the alarm function. */
+#define HAVE_ALARM
/* Define if you have the <alloca.h> header file. */
#define HAVE_ALLOCA_H
@@ -101,6 +110,9 @@
/* Define if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H
+/* Define if you have the `ftruncate' function. */
+#define HAVE_FTRUNCATE
+
/* Define if getaddrinfo exists and works */
#define HAVE_GETADDRINFO
@@ -144,7 +156,7 @@
#define HAVE_INTTYPES_H
/* Define if you have the <io.h> header file. */
-#define HAVE_IO_H
+#undef HAVE_IO_H
/* Define if you have the `krb_get_our_ip_for_realm' function. */
#undef HAVE_KRB_GET_OUR_IP_FOR_REALM
@@ -462,8 +474,8 @@
/* Define to the type pointed by arg 2 for recvfrom. */
#define RECVFROM_TYPE_ARG2 void
-/* Define to 1 if the type pointed by arg 2 for recvfrom is void. */
-#define RECVFROM_TYPE_ARG2_IS_VOID 1
+/* Define if the type pointed by arg 2 for recvfrom is void. */
+#define RECVFROM_TYPE_ARG2_IS_VOID
/* Define to the type of arg 3 for recvfrom. */
#define RECVFROM_TYPE_ARG3 size_t
@@ -500,3 +512,5 @@
/* Define to the function return type for send. */
#define SEND_TYPE_RETV ssize_t
+
+#endif /* HEADER_CURL_CONFIG_RISCOS_H */
diff --git a/lib/easy.c b/lib/easy.c
index 60a55edf8..6e8ff770a 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -66,6 +66,7 @@
#include "curl_ntlm.h"
#include "connect.h" /* for Curl_getconnectinfo */
#include "slist.h"
+#include "amigaos.h"
#include "curl_rand.h"
#include "non-ascii.h"
#include "warnless.h"
@@ -238,8 +239,8 @@ CURLcode curl_global_init(long flags)
}
#ifdef __AMIGA__
- if(!amiga_init()) {
- DEBUGF(fprintf(stderr, "Error: amiga_init failed\n"));
+ if(!Curl_amiga_init()) {
+ DEBUGF(fprintf(stderr, "Error: Curl_amiga_init failed\n"));
return CURLE_FAILED_INIT;
}
#endif
@@ -328,9 +329,7 @@ void curl_global_cleanup(void)
if(init_flags & CURL_GLOBAL_WIN32)
win32_cleanup();
-#ifdef __AMIGA__
- amiga_cleanup();
-#endif
+ Curl_amiga_cleanup();
#if defined(USE_LIBSSH2) && defined(HAVE_LIBSSH2_EXIT)
(void)libssh2_exit();
diff --git a/lib/setup.h b/lib/setup.h
index 121943758..6ce93db4d 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -1,5 +1,5 @@
-#ifndef HEADER_CURL_LIB_SETUP_H
-#define HEADER_CURL_LIB_SETUP_H
+#ifndef HEADER_CURL_SETUP_H
+#define HEADER_CURL_SETUP_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@@ -54,8 +54,12 @@
# include "config-mac.h"
#endif
+#ifdef __riscos__
+# include "config-riscos.h"
+#endif
+
#ifdef __AMIGA__
-# include "amigaos.h"
+# include "config-amigaos.h"
#endif
#ifdef __SYMBIAN32__
@@ -281,6 +285,16 @@
# include <ioLib.h> /* for basic I/O interface functions */
#endif
+#ifdef __AMIGA__
+# ifndef __ixemul__
+# include <exec/types.h>
+# include <exec/execbase.h>
+# include <proto/exec.h>
+# include <proto/dos.h>
+# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
+# endif
+#endif
+
#include <stdio.h>
#ifdef HAVE_ASSERT_H
#include <assert.h>
@@ -640,4 +654,4 @@ int netware_init(void);
# define SHUT_RDWR 0x02
#endif
-#endif /* HEADER_CURL_LIB_SETUP_H */
+#endif /* HEADER_CURL_SETUP_H */
diff --git a/maketgz b/maketgz
index 9c639f964..880882ad4 100755
--- a/maketgz
+++ b/maketgz
@@ -9,7 +9,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2012, 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
@@ -91,12 +91,6 @@ findprog()
return 0
}
-echo "maketgz: cp lib/curl_config.h.in src/curl_config.h.in"
-cp lib/curl_config.h.in src/curl_config.h.in
-
-echo "maketgz: cp lib/config-win32.h src/config-win32.h"
-cp lib/config-win32.h src/config-win32.h
-
############################################################################
#
# Enforce a rerun of configure (updates the VERSION)
diff --git a/src/Makefile.am b/src/Makefile.am
index a181f06bc..3e372422f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2012, 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
@@ -32,7 +32,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
# $(top_builddir)/src is for curl's generated src/curl_config.h file
# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files
-# $(top_srcdir)/src is for curl's src/setup.h and "curl-private" files
+# $(top_srcdir)/src is for curl's src/tool_setup.h and "curl-private" files
INCLUDES = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \
@@ -51,16 +51,16 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@
curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la
-BUILT_SOURCES = hugehelp.c config-win32.h
-CLEANFILES = hugehelp.c config-win32.h
+BUILT_SOURCES = hugehelp.c
+CLEANFILES = hugehelp.c
# Use the C locale to ensure that only ASCII characters appear in the
# embedded text.
NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script
EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 Makefile.m32 \
- curl_config.h.in macos/curl.mcp.xml.sit.hqx \
+ macos/curl.mcp.xml.sit.hqx \
macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp vc6curlsrc.dsp \
- macos/src/macos_main.cpp config-amigaos.h makefile.amiga curl.rc \
+ macos/src/macos_main.cpp makefile.amiga curl.rc \
Makefile.netware Makefile.inc Makefile.Watcom vc6curlsrc.dsw \
CMakeLists.txt
@@ -68,11 +68,6 @@ MANPAGE=$(top_srcdir)/docs/curl.1
README=$(top_srcdir)/docs/MANUAL
MKHELP=$(top_srcdir)/src/mkhelp.pl
HUGE=hugehelp.c
-CFGWIN32=config-win32.h
-
-$(CFGWIN32): $(top_srcdir)/lib/config-win32.h
- echo "creating $(CFGWIN32)"
- @(cp $(top_srcdir)/lib/config-win32.h $(CFGWIN32))
if USE_MANUAL
# Here are the stuff to create a built-in manual
@@ -80,7 +75,7 @@ if USE_MANUAL
if HAVE_LIBZ
# This generates the hugehelp.c file in both uncompressed and compressed formats
$(HUGE): $(README) $(MANPAGE) mkhelp.pl
- echo '#include "setup.h"' > $(HUGE)
+ echo '#include "tool_setup.h"' > $(HUGE)
echo '#ifndef HAVE_LIBZ' >> $(HUGE)
$(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE)
echo '#else' >> $(HUGE)
@@ -89,7 +84,7 @@ $(HUGE): $(README) $(MANPAGE) mkhelp.pl
else # HAVE_LIBZ
# This generates the hugehelp.c file uncompressed only
$(HUGE): $(README) $(MANPAGE) mkhelp.pl
- echo '#include "setup.h"' > $(HUGE)
+ echo '#include "tool_setup.h"' > $(HUGE)
$(NROFF) $(MANPAGE) | $(PERL) $(MKHELP) $(README) >> $(HUGE)
endif
@@ -102,9 +97,9 @@ $(HUGE):
endif
# ignore hugehelp.c since it is generated source code and it plays by slightly
-# different rules! config-win32.h already checked in lib subdir.
+# different rules!
checksrc:
- @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/src -Whugehelp.c -Wconfig-win32.h $(curl_SOURCES)
+ @@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/src -Whugehelp.c $(curl_SOURCES)
if CURLDEBUG
# for debug builds, we scan the sources on all regular make invokes
diff --git a/src/Makefile.inc b/src/Makefile.inc
index a43ac514c..e070b3a66 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -52,8 +52,7 @@ CURL_CFILES = hugehelp.c \
tool_writeout.c \
tool_xattr.c
-CURL_HFILES = hugehelp.h setup.h config-win32.h config-mac.h \
- config-riscos.h \
+CURL_HFILES = hugehelp.h \
tool_binmode.h \
tool_bname.h \
tool_cb_dbg.h \
@@ -84,6 +83,7 @@ CURL_HFILES = hugehelp.h setup.h config-win32.h config-mac.h \
tool_parsecfg.h \
tool_sdecls.h \
tool_setopt.h \
+ tool_setup.h \
tool_sleep.h \
tool_urlglob.h \
tool_util.h \
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 8e66f7919..bd0c2f8e1 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -323,7 +323,7 @@ vpath %.c $(CURL_LIB)
all: prebuild $(TARGET).nlm
-prebuild: $(OBJDIR) $(OBJDIR)/version.inc curl_config.h
+prebuild: $(OBJDIR) $(OBJDIR)/version.inc
$(OBJDIR)/%.o: %.c
# @echo Compiling $<
@@ -342,7 +342,6 @@ clean:
ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs"
-$(RM) hugehelp.c
endif
- -$(RM) curl_config.h
-$(RM) -r $(OBJDIR)
distclean vclean: clean
@@ -449,210 +448,6 @@ endif
@echo $(DL)output $(TARGET).nlm$(DL) >> $@
endif
-curl_config.h: Makefile.netware
- @echo Creating $@
- @echo $(DL)/* $@ for NetWare target.$(DL) > $@
- @echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
- @echo $(DL)** All your changes will be lost!!$(DL) >> $@
- @echo $(DL)*/$(DL) >> $@
- @echo $(DL)#ifndef NETWARE$(DL) >> $@
- @echo $(DL)#error This $(notdir $@) is created for NetWare platform!$(DL) >> $@
- @echo $(DL)#endif$(DL) >> $@
- @echo $(DL)#define VERSION "$(LIBCURL_VERSION_STR)"$(DL) >> $@
- @echo $(DL)#define PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/"$(DL) >> $@
-ifeq ($(LIBARCH),CLIB)
- @echo $(DL)#define OS "i586-pc-clib-NetWare"$(DL) >> $@
- @echo $(DL)#define NETDB_USE_INTERNET 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRICMP 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRNICMP 1$(DL) >> $@
- @echo $(DL)#define RECV_TYPE_ARG1 int$(DL) >> $@
- @echo $(DL)#define RECV_TYPE_ARG2 char *$(DL) >> $@
- @echo $(DL)#define RECV_TYPE_ARG3 int$(DL) >> $@
- @echo $(DL)#define RECV_TYPE_ARG4 int$(DL) >> $@
- @echo $(DL)#define RECV_TYPE_RETV int$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_ARG1 int$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_ARG2 char$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_ARG3 int$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_ARG4 int$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_ARG5 struct sockaddr$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_ARG6 int$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_RETV int$(DL) >> $@
- @echo $(DL)#define SEND_QUAL_ARG2$(DL) >> $@
- @echo $(DL)#define SEND_TYPE_ARG1 int$(DL) >> $@
- @echo $(DL)#define SEND_TYPE_ARG2 char *$(DL) >> $@
- @echo $(DL)#define SEND_TYPE_ARG3 int$(DL) >> $@
- @echo $(DL)#define SEND_TYPE_ARG4 int$(DL) >> $@
- @echo $(DL)#define SEND_TYPE_RETV int$(DL) >> $@
- @echo $(DL)#define SIZEOF_SIZE_T 4$(DL) >> $@
- @echo $(DL)#define pressanykey PressAnyKeyToContinue$(DL) >> $@
-else
- @echo $(DL)#define OS "i586-pc-libc-NetWare"$(DL) >> $@
- @echo $(DL)#define HAVE_FTRUNCATE 1$(DL) >> $@
- @echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@
- @echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@
- @echo $(DL)#define HAVE_STDINT_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRCASECMP 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRTOLL 1$(DL) >> $@
- @echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_SYS_SELECT_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_TERMIOS_H 1$(DL) >> $@
- @echo $(DL)#define RECV_TYPE_ARG1 int$(DL) >> $@
- @echo $(DL)#define RECV_TYPE_ARG2 void *$(DL) >> $@
- @echo $(DL)#define RECV_TYPE_ARG3 size_t$(DL) >> $@
- @echo $(DL)#define RECV_TYPE_ARG4 int$(DL) >> $@
- @echo $(DL)#define RECV_TYPE_RETV ssize_t$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_ARG1 int$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_ARG2 void$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_ARG3 size_t$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_ARG4 int$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_ARG5 struct sockaddr$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_ARG6 size_t$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_RETV ssize_t$(DL) >> $@
- @echo $(DL)#define RECVFROM_TYPE_ARG2_IS_VOID 1$(DL) >> $@
- @echo $(DL)#define SEND_QUAL_ARG2$(DL) >> $@
- @echo $(DL)#define SEND_TYPE_ARG1 int$(DL) >> $@
- @echo $(DL)#define SEND_TYPE_ARG2 void *$(DL) >> $@
- @echo $(DL)#define SEND_TYPE_ARG3 size_t$(DL) >> $@
- @echo $(DL)#define SEND_TYPE_ARG4 int$(DL) >> $@
- @echo $(DL)#define SEND_TYPE_RETV ssize_t$(DL) >> $@
- @echo $(DL)#define SIZEOF_OFF_T 8$(DL) >> $@
- @echo $(DL)#define SIZEOF_SIZE_T 8$(DL) >> $@
- @echo $(DL)#define _LARGEFILE 1$(DL) >> $@
-ifdef ENABLE_IPV6
- @echo $(DL)#define ENABLE_IPV6 1$(DL) >> $@
- @echo $(DL)#define HAVE_AF_INET6 1$(DL) >> $@
- @echo $(DL)#define HAVE_PF_INET6 1$(DL) >> $@
- @echo $(DL)#define HAVE_FREEADDRINFO 1$(DL) >> $@
- @echo $(DL)#define HAVE_GETADDRINFO 1$(DL) >> $@
- @echo $(DL)#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRUCT_ADDRINFO 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRUCT_IN6_ADDR 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRUCT_SOCKADDR_IN6 1$(DL) >> $@
- @echo $(DL)#define SIZEOF_STRUCT_IN6_ADDR 16$(DL) >> $@
-endif
-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) >> $@
- @echo $(DL)#define HAVE_GETHOSTBYNAME 1$(DL) >> $@
- @echo $(DL)#define HAVE_GETPROTOBYNAME 1$(DL) >> $@
- @echo $(DL)#define HAVE_GMTIME_R 1$(DL) >> $@
- @echo $(DL)#define HAVE_INET_ADDR 1$(DL) >> $@
- @echo $(DL)#define HAVE_IOCTL 1$(DL) >> $@
- @echo $(DL)#define HAVE_IOCTL_FIONBIO 1$(DL) >> $@
- @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_LL 1$(DL) >> $@
- @echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_LOCALTIME_R 1$(DL) >> $@
- @echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_NETINET_IN_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_RECV 1$(DL) >> $@
- @echo $(DL)#define HAVE_RECVFROM 1$(DL) >> $@
- @echo $(DL)#define HAVE_SELECT 1$(DL) >> $@
- @echo $(DL)#define HAVE_SEND 1$(DL) >> $@
- @echo $(DL)#define HAVE_SETJMP_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_SETLOCALE 1$(DL) >> $@
- @echo $(DL)#define HAVE_SIGNAL 1$(DL) >> $@
- @echo $(DL)#define HAVE_SIGNAL_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_SIG_ATOMIC_T 1$(DL) >> $@
- @echo $(DL)#define HAVE_SOCKET 1$(DL) >> $@
- @echo $(DL)#define HAVE_STDLIB_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRDUP 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRFTIME 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRING_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRSTR 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRUCT_TIMEVAL 1$(DL) >> $@
- @echo $(DL)#define HAVE_SYS_IOCTL_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_SYS_STAT_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_SYS_TIME_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_TIME_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_UNAME 1$(DL) >> $@
- @echo $(DL)#define HAVE_UNISTD_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_UTIME 1$(DL) >> $@
- @echo $(DL)#define HAVE_UTIME_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_WRITEV 1$(DL) >> $@
- @echo $(DL)#define RETSIGTYPE void$(DL) >> $@
- @echo $(DL)#define SIZEOF_INT 4$(DL) >> $@
- @echo $(DL)#define SIZEOF_SHORT 2$(DL) >> $@
- @echo $(DL)#define SIZEOF_STRUCT_IN_ADDR 4$(DL) >> $@
- @echo $(DL)#define STDC_HEADERS 1$(DL) >> $@
- @echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@
-ifdef DISABLE_LDAP
- @echo $(DL)#define CURL_DISABLE_LDAP 1$(DL) >> $@
-else
- @echo $(DL)#define CURL_HAS_NOVELL_LDAPSDK 1$(DL) >> $@
-ifndef DISABLE_LDAPS
- @echo $(DL)#define HAVE_LDAP_SSL 1$(DL) >> $@
-endif
- @echo $(DL)#define HAVE_LDAP_SSL_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_LDAP_URL_PARSE 1$(DL) >> $@
-endif
-ifdef NW_WINSOCK
- @echo $(DL)#define HAVE_CLOSESOCKET 1$(DL) >> $@
-else
- @echo $(DL)#define USE_BSD_SOCKETS 1$(DL) >> $@
- @echo $(DL)#define HAVE_SYS_TYPES_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_SYS_SOCKET_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_SYS_SOCKIO_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_NETDB_H 1$(DL) >> $@
-endif
-ifdef WITH_ARES
- @echo $(DL)#define USE_ARES 1$(DL) >> $@
-endif
-ifdef WITH_ZLIB
- @echo $(DL)#define HAVE_ZLIB_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_LIBZ 1$(DL) >> $@
-endif
-ifdef WITH_SSL
- @echo $(DL)#define USE_SSLEAY 1$(DL) >> $@
- @echo $(DL)#define USE_OPENSSL 1$(DL) >> $@
- @echo $(DL)#define HAVE_OPENSSL_X509_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_OPENSSL_SSL_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_OPENSSL_RSA_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_OPENSSL_PEM_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_OPENSSL_ERR_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_OPENSSL_CRYPTO_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_OPENSSL_ENGINE_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_LIBSSL 1$(DL) >> $@
- @echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@
- @echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@
-ifdef WITH_SPNEGO
- @echo $(DL)#define HAVE_SPNEGO 1$(DL) >> $@
-endif
-else
-ifdef WITH_AXTLS
- @echo $(DL)#define USE_AXTLS 1$(DL) >> $@
-endif
-endif
-ifdef WITH_SSH2
- @echo $(DL)#define USE_LIBSSH2 1$(DL) >> $@
- @echo $(DL)#define HAVE_LIBSSH2_H 1$(DL) >> $@
-endif
-ifdef WITH_IDN
- @echo $(DL)#define HAVE_LIBIDN 1$(DL) >> $@
- @echo $(DL)#define HAVE_TLD_H 1$(DL) >> $@
-endif
-ifdef WITH_RTMP
- @echo $(DL)#define USE_LIBRTMP 1$(DL) >> $@
-endif
- @echo $(DL)#ifdef __GNUC__$(DL) >> $@
- @echo $(DL)#define HAVE_VARIADIC_MACROS_GCC 1$(DL) >> $@
- @echo $(DL)#else$(DL) >> $@
- @echo $(DL)#define HAVE_VARIADIC_MACROS_C99 1$(DL) >> $@
- @echo $(DL)#endif$(DL) >> $@
-ifdef CABUNDLE
- @echo $(DL)#define CURL_CA_BUNDLE "$(CABUNDLE)"$(DL) >> $@
-else
- @echo $(DL)#define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE")$(DL) >> $@
-endif
-
hugehelp.c:
@echo Creating $@
@$(CP) hugehelp.c.cvs $@
diff --git a/src/config-amigaos.h b/src/config-amigaos.h
deleted file mode 100644
index 7f8e0a869..000000000
--- a/src/config-amigaos.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef CURL_CONFIG_AMIGAOS_H
-#define CURL_CONFIG_AMIGAOS_H
-/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
- * \___|\___/|_| \_\_____|
- *
- * 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
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-#ifdef __AMIGA__ /* Any AmigaOS flavour */
-
-/* Define to 1 if you want the built-in manual */
-#define USE_MANUAL 1
-
-#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
-#define HAVE_UTIME_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_SOCKET_H 1
-#define HAVE_WRITABLE_ARGV 1
-#define HAVE_SYS_TIME_H 1
-#define HAVE_TIME_H 1
-#define TIME_WITH_SYS_TIME 1
-#define HAVE_STRUCT_TIMEVAL 1
-
-#if 0
-# define HAVE_TERMIOS_H 1
-# define HAVE_FTRUNCATE 1
-#endif
-
-#define HAVE_PWD_H 1
-
-#ifndef F_OK
-# define F_OK 0
-#endif
-#ifndef O_RDONLY
-# define O_RDONLY 0x0000 /* open for reading only */
-#endif
-#ifndef LONG_MAX
-# define LONG_MAX 0x7fffffffL /* max value for a long */
-#endif
-#ifndef LONG_MIN
-# define LONG_MIN (-0x7fffffffL-1) /* min value for a long */
-#endif
-
-#define SIZEOF_INT 4
-#define SIZEOF_SHORT 2
-
-#endif /* __AMIGA__ */
-#endif /* CURL_CONFIG_AMIGAOS_H */
diff --git a/src/config-mac.h b/src/config-mac.h
deleted file mode 100644
index 19c24c760..000000000
--- a/src/config-mac.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef __SRC_CONFIG_MAC_H
-#define __SRC_CONFIG_MAC_H
-/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
- * \___|\___/|_| \_\_____|
- *
- * 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
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-/* =================================================================== */
-/* src/config-mac.h - Hand crafted config file for Mac OS 9 */
-/* =================================================================== */
-/* On Mac OS X you must run configure to generate curl_config.h file */
-/* =================================================================== */
-
-/* Define to 1 if you want the built-in manual */
-#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
-
-#define HAVE_SETVBUF 1
-#define HAVE_UTIME 1
-#define HAVE_FTRUNCATE 1
-
-#define HAVE_TIME_H 1
-#define HAVE_SYS_TIME_H 1
-#define TIME_WITH_SYS_TIME 1
-#define HAVE_STRUCT_TIMEVAL 1
-
-#define SIZEOF_INT 4
-#define SIZEOF_SHORT 2
-
-#define main(x,y) curl_main(x,y)
-
-/* we provide our own strdup prototype */
-char *strdup(char *s1);
-
-#endif /* __SRC_CONFIG_MAC_H */
diff --git a/src/config-riscos.h b/src/config-riscos.h
deleted file mode 100644
index c9aa7bcc0..000000000
--- a/src/config-riscos.h
+++ /dev/null
@@ -1,402 +0,0 @@
-/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
- * \___|\___/|_| \_\_____|
- *
- * 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
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-/* Name of this package! */
-#undef PACKAGE
-
-/* Version number of this archive. */
-#undef VERSION
-
-/* Define if you have the getpass function. */
-#undef HAVE_GETPASS
-
-/* Define cpu-machine-OS */
-#define OS "ARM-RISC OS"
-
-/* Define to 1 if you want the built-in manual */
-#define USE_MANUAL 1
-
-/* Define if you have the gethostbyaddr_r() function with 5 arguments */
-#undef HAVE_GETHOSTBYADDR_R_5
-
-/* Define if you have the gethostbyaddr_r() function with 7 arguments */
-#undef HAVE_GETHOSTBYADDR_R_7
-
-/* Define if you have the gethostbyaddr_r() function with 8 arguments */
-#undef HAVE_GETHOSTBYADDR_R_8
-
-/* Define if you have the gethostbyname_r() function with 3 arguments */
-#undef HAVE_GETHOSTBYNAME_R_3
-
-/* Define if you have the gethostbyname_r() function with 5 arguments */
-#undef HAVE_GETHOSTBYNAME_R_5
-
-/* Define if you have the gethostbyname_r() function with 6 arguments */
-#undef HAVE_GETHOSTBYNAME_R_6
-
-/* Define if you need the _REENTRANT define for some functions */
-#undef NEED_REENTRANT
-
-/* Define if you have the Kerberos4 libraries (including -ldes) */
-#undef HAVE_KRB4
-
-/* Define if you want to enable IPv6 support */
-#undef ENABLE_IPV6
-
-/* Define if struct sockaddr_in6 has the sin6_scope_id member */
-#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-
-/* Define this to 'int' if ssize_t is not an available typedefed type */
-#undef ssize_t
-
-/* Define this as a suitable file to read random data from */
-#undef RANDOM_FILE
-
-/* Define this to your Entropy Gathering Daemon socket pathname */
-#undef EGD_SOCKET
-
-/* Define if you want to enable IPv6 support */
-#undef ENABLE_IPV6
-
-/* Define if you have the <alloca.h> header file. */
-#define HAVE_ALLOCA_H
-
-/* Define if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H
-
-/* Define if you have the `closesocket' function. */
-#undef HAVE_CLOSESOCKET
-
-/* Define if you have the <crypto.h> header file. */
-#undef HAVE_CRYPTO_H
-
-/* 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
-
-/* Define if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H
-
-/* Define if you have the `ftruncate' function. */
-#define HAVE_FTRUNCATE
-
-/* Define if getaddrinfo exists and works */
-#define HAVE_GETADDRINFO
-
-/* Define if you have the `geteuid' function. */
-#undef HAVE_GETEUID
-
-/* Define if you have the `gethostbyaddr' function. */
-#define HAVE_GETHOSTBYADDR
-
-/* Define if you have the `gethostbyaddr_r' function. */
-#undef HAVE_GETHOSTBYADDR_R
-
-/* Define if you have the `gethostbyname_r' function. */
-#undef HAVE_GETHOSTBYNAME_R
-
-/* Define if you have the `gethostname' function. */
-#define HAVE_GETHOSTNAME
-
-/* Define if you have the <getopt.h> header file. */
-#define HAVE_GETOPT_H
-
-/* Define if you have the `getpass_r' function. */
-#undef HAVE_GETPASS_R
-
-/* Define if you have the `getpwuid' function. */
-#undef HAVE_GETPWUID
-
-/* Define if you have the `getservbyname' function. */
-#undef HAVE_GETSERVBYNAME
-
-/* Define if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY
-
-/* Define if you have the `timeval' struct. */
-#define HAVE_STRUCT_TIMEVAL
-
-/* Define if you have the `inet_addr' function. */
-#undef HAVE_INET_ADDR
-
-/* Define if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H
-
-/* Define if you have the <io.h> header file. */
-#undef HAVE_IO_H
-
-/* Define if you have the `krb_get_our_ip_for_realm' function. */
-#undef HAVE_KRB_GET_OUR_IP_FOR_REALM
-
-/* Define if you have the <krb.h> header file. */
-#undef HAVE_KRB_H
-
-/* Define if you have the `crypto' library (-lcrypto). */
-#undef HAVE_LIBCRYPTO
-
-/* Define if you have the `nsl' library (-lnsl). */
-#undef HAVE_LIBNSL
-
-/* Define if you have the `resolv' library (-lresolv). */
-#undef HAVE_LIBRESOLV
-
-/* Define if you have the `resolve' library (-lresolve). */
-#undef HAVE_LIBRESOLVE
-
-/* Define if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
-/* Define if you have the `ssl' library (-lssl). */
-#undef HAVE_LIBSSL
-
-/* Define if you have the `ucb' library (-lucb). */
-#undef HAVE_LIBUCB
-
-/* Define if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
-
-/* Define if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H
-
-/* Define to 1 if you need the malloc.h header file even with stdlib.h */
-/* #define NEED_MALLOC_H 1 */
-
-/* Define if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if you have the <netdb.h> header file. */
-#define HAVE_NETDB_H
-
-/* Define if you have the <netinet/if_ether.h> header file. */
-#undef HAVE_NETINET_IF_ETHER_H
-
-/* Define if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H
-
-/* Define if you have the <net/if.h> header file. */
-#define HAVE_NET_IF_H
-
-/* Define if you have the <openssl/crypto.h> header file. */
-#undef HAVE_OPENSSL_CRYPTO_H
-
-/* Define if you have the <openssl/err.h> header file. */
-#undef HAVE_OPENSSL_ERR_H
-
-/* Define if you have the <openssl/pem.h> header file. */
-#undef HAVE_OPENSSL_PEM_H
-
-/* Define if you have the <openssl/rsa.h> header file. */
-#undef HAVE_OPENSSL_RSA_H
-
-/* Define if you have the <openssl/ssl.h> header file. */
-#undef HAVE_OPENSSL_SSL_H
-
-/* Define if you have the <openssl/x509.h> header file. */
-#undef HAVE_OPENSSL_X509_H
-
-/* Define if you have the <pem.h> header file. */
-#undef HAVE_PEM_H
-
-/* Define if you have the `perror' function. */
-#undef HAVE_PERROR
-
-/* Define if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
-
-/* Define if you have the `RAND_egd' function. */
-#undef HAVE_RAND_EGD
-
-/* Define if you have the `RAND_screen' function. */
-#undef HAVE_RAND_SCREEN
-
-/* Define if you have the `RAND_status' function. */
-#undef HAVE_RAND_STATUS
-
-/* Define if you have the <rsa.h> header file. */
-#undef HAVE_RSA_H
-
-/* Define if you have the `select' function. */
-#define HAVE_SELECT
-
-/* Define if you have the `setvbuf' function. */
-#undef HAVE_SETVBUF
-
-/* Define if you have the <sgtty.h> header file. */
-#define HAVE_SGTTY_H
-
-/* Define if you have the `sigaction' function. */
-#undef HAVE_SIGACTION
-
-/* Define if you have the `signal' function. */
-#define HAVE_SIGNAL
-
-/* Define if you have the `socket' function. */
-#define HAVE_SOCKET
-
-/* Define if you have the <ssl.h> header file. */
-#undef HAVE_SSL_H
-
-/* Define if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H
-
-/* Define if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define if you have the `strcmpi' function. */
-#undef HAVE_STRCMPI
-
-/* Define if you have the `strdup' function. */
-#define HAVE_STRDUP
-
-/* Define if you have the `strftime' function. */
-#define HAVE_STRFTIME
-
-/* Define if you have the `stricmp' function. */
-#define HAVE_STRICMP
-
-/* Define if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H
-
-/* Define if you have the `strlcat' function. */
-#undef HAVE_STRLCAT
-
-/* Define if you have the `strlcpy' function. */
-#undef HAVE_STRLCPY
-
-/* Define if you have the `strstr' function. */
-#define HAVE_STRSTR
-
-/* Define if you have the `strtok_r' function. */
-#undef HAVE_STRTOK_R
-
-/* Define if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
-
-/* Define if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H
-
-/* Define if you have the <sys/sockio.h> header file. */
-#undef HAVE_SYS_SOCKIO_H
-
-/* Define if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H
-
-/* Define if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H
-
-/* Define if you have the `tcgetattr' function. */
-#define HAVE_TCGETATTR
-
-/* Define if you have the `tcsetattr' function. */
-#define HAVE_TCSETATTR
-
-/* Define if you have the <termios.h> header file. */
-#define HAVE_TERMIOS_H
-
-/* Define if you have the <termio.h> header file. */
-#undef HAVE_TERMIO_H
-
-/* Define if you have the <time.h> header file. */
-#undef HAVE_TIME_H
-
-/* Define if you have the `uname' function. */
-#define HAVE_UNAME
-
-/* Define if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H
-
-/* Define if you have the <winsock.h> header file. */
-#undef HAVE_WINSOCK_H
-
-/* Define if you have the <x509.h> header file. */
-#undef HAVE_X509_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long double', as computed by sizeof. */
-#undef SIZEOF_LONG_DOUBLE
-
-/* The size of `long long', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG
-
-/* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
-
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Version number of package */
-#undef VERSION
-
-/* Define if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef ssize_t
-
-/* Define if you have the ioctl function. */
-#define HAVE_IOCTL
-
-/* Define if you have a working ioctl FIONBIO function. */
-#define HAVE_IOCTL_FIONBIO
diff --git a/src/hugehelp.c.cvs b/src/hugehelp.c.cvs
index 1eb2fa537..7cecf64db 100644
--- a/src/hugehelp.c.cvs
+++ b/src/hugehelp.c.cvs
@@ -1,4 +1,4 @@
-#include "setup.h"
+#include "tool_setup.h"
#include "hugehelp.h"
void hugehelp(void)
{
diff --git a/src/hugehelp.h b/src/hugehelp.h
index 842836dda..698c916a6 100644
--- a/src/hugehelp.h
+++ b/src/hugehelp.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
void hugehelp(void);
diff --git a/src/makefile.dj b/src/makefile.dj
index 29e958693..094ef665a 100644
--- a/src/makefile.dj
+++ b/src/makefile.dj
@@ -3,7 +3,7 @@
# Gisle Vanem <gvanem@broadpark.no>
#
-DEPEND_PREREQ = curl_config.h # hugehelp.c
+DEPEND_PREREQ = # hugehelp.c
top_srcdir = ..
TOPDIR = ..
@@ -37,19 +37,12 @@ CFLAGS += -DUSE_ENVIRONMENT
PROGRAM = curl.exe
OBJECTS += $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o))
-all: $(OBJ_DIR) curl_config.h $(PROGRAM)
+all: $(OBJ_DIR) $(PROGRAM)
@echo Welcome to cURL
$(PROGRAM): $(OBJECTS) ../lib/libcurl.a
$(CC) -o $@ $^ $(LDFLAGS) $(EX_LIBS)
-curl_config.h:
-ifeq ($(IS_UNIX_SHELL),1)
- @echo '#include "../lib/config-dos.h"' > $@
-else
- @echo #include "../lib/config-dos.h" > $@
-endif
-
#
# groff 1.18+ requires "-P -c"
#
@@ -60,7 +53,6 @@ hugehelp.c: ../docs/MANUAL ../docs/curl.1 mkhelp.pl
# clean generated files
#
genclean:
- - $(DELETE) curl_config.h
- $(DELETE) hugehelp.c
# clean object files and subdir
diff --git a/src/setup.h b/src/setup.h
deleted file mode 100644
index abb0706a7..000000000
--- a/src/setup.h
+++ /dev/null
@@ -1,296 +0,0 @@
-#ifndef HEADER_CURL_SRC_SETUP_H
-#define HEADER_CURL_SRC_SETUP_H
-/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
- * \___|\___/|_| \_\_____|
- *
- * 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
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-
-#define CURL_NO_OLDIES
-
-/*
- * Define WIN32 when build target is Win32 API
- */
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) && \
- !defined(__SYMBIAN32__)
-#define WIN32
-#endif
-
-/*
- * Include configuration script results or hand-crafted
- * configuration file for platforms which lack config tool.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "curl_config.h"
-#else
-
-#ifdef WIN32
-#include "config-win32.h"
-#endif
-
-#if defined(macintosh) && defined(__MRC__)
-# include "config-mac.h"
-#endif
-
-#ifdef __riscos__
-#include "config-riscos.h"
-#endif
-
-#ifdef __AMIGA__
-#include "config-amigaos.h"
-#endif
-
-#ifdef __SYMBIAN32__
-#include "config-symbian.h"
-#endif
-
-#ifdef TPF
-#include "config-tpf.h"
-#endif
-
-#endif /* HAVE_CONFIG_H */
-
-/*
- * AIX 4.3 and newer needs _THREAD_SAFE defined to build
- * proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_THREAD_SAFE
-# ifndef _THREAD_SAFE
-# define _THREAD_SAFE
-# endif
-#endif
-
-/*
- * Tru64 needs _REENTRANT set for a few function prototypes and
- * things to appear in the system header files. Unixware needs it
- * to build proper reentrant code. Others may also need it.
- */
-
-#ifdef NEED_REENTRANT
-# ifndef _REENTRANT
-# define _REENTRANT
-# endif
-#endif
-
-/*
- * Include header files for windows builds before redefining anything.
- * Use this preproessor block only to include or exclude windows.h,
- * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs
- * to any other further and independent block. Under Cygwin things work
- * just as under linux (e.g. <sys/socket.h>) and the winsock headers should
- * never be included when __CYGWIN__ is defined. configure script takes
- * care of this, not defining HAVE_WINDOWS_H, HAVE_WINSOCK_H, HAVE_WINSOCK2_H,
- * neither HAVE_WS2TCPIP_H when __CYGWIN__ is defined.
- */
-
-#ifdef HAVE_WINDOWS_H
-# ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-# endif
-# include <windows.h>
-# ifdef HAVE_WINSOCK2_H
-# include <winsock2.h>
-# ifdef HAVE_WS2TCPIP_H
-# include <ws2tcpip.h>
-# endif
-# else
-# ifdef HAVE_WINSOCK_H
-# include <winsock.h>
-# endif
-# endif
-#endif
-
-/*
- * Define USE_WINSOCK to 2 if we have and use WINSOCK2 API, else
- * define USE_WINSOCK to 1 if we have and use WINSOCK API, else
- * undefine USE_WINSOCK.
- */
-
-#undef USE_WINSOCK
-
-#ifdef HAVE_WINSOCK2_H
-# define USE_WINSOCK 2
-#else
-# ifdef HAVE_WINSOCK_H
-# define USE_WINSOCK 1
-# endif
-#endif
-
-#ifdef USE_LWIPSOCK
-# include <lwip/sockets.h>
-# include <lwip/netdb.h>
-#endif
-
-#ifdef TPF
-# include <sys/socket.h>
- /* change which select is used for the curl command line tool */
-# define select(a,b,c,d,e) tpf_select_bsd(a,b,c,d,e)
- /* and turn off the progress meter */
-# define CONF_DEFAULT (0|CONF_NOPROGRESS)
-#endif
-
-#include <stdio.h>
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#endif
-
-
-#ifdef __TANDEM
-#include <floss.h>
-#endif
-
-/*
- * Large file (>2Gb) support using WIN32 functions.
- */
-
-#ifdef USE_WIN32_LARGE_FILES
-# include <io.h>
-# include <sys/types.h>
-# include <sys/stat.h>
-# undef lseek
-# define lseek(fdes,offset,whence) _lseeki64(fdes, offset, whence)
-# define fstat(fdes,stp) _fstati64(fdes, stp)
-# define stat(fname,stp) _stati64(fname, stp)
-# define struct_stat struct _stati64
-# define LSEEK_ERROR (__int64)-1
-#endif
-
-/*
- * Small file (<2Gb) support using WIN32 functions.
- */
-
-#ifdef USE_WIN32_SMALL_FILES
-# include <io.h>
-# include <sys/types.h>
-# include <sys/stat.h>
-# undef lseek
-# define lseek(fdes,offset,whence) _lseek(fdes, (long)offset, whence)
-# define fstat(fdes,stp) _fstat(fdes, stp)
-# define stat(fname,stp) _stat(fname, stp)
-# define struct_stat struct _stat
-# define LSEEK_ERROR (long)-1
-#endif
-
-#ifndef struct_stat
-# define struct_stat struct stat
-#endif
-
-#ifndef LSEEK_ERROR
-# define LSEEK_ERROR (off_t)-1
-#endif
-
-#ifndef OS
-#define OS "unknown"
-#endif
-
-#if !defined(fileno) && !defined(WIN32) /* sunos 4 have this as a macro! */
-int fileno( FILE *stream);
-#endif
-
-#ifdef WIN32
-#define DIR_CHAR "\\"
-#define DOT_CHAR "_"
-#else
-#ifdef __EMX__
-/* 20000318 mgs
- * OS/2 supports leading dots in filenames if the volume is formatted
- * with JFS or HPFS. */
-#define DIR_CHAR "\\"
-#define DOT_CHAR "."
-#else
-
-#ifdef DJGPP
-#include <tcp.h>
-#ifdef word
-#undef word
-#endif
-#define DIR_CHAR "/"
-#define DOT_CHAR "_"
-#else
-
-#define DIR_CHAR "/"
-#define DOT_CHAR "."
-
-#endif /* !DJGPP */
-#endif /* !__EMX__ */
-#endif /* !WIN32 */
-
-#ifdef __riscos__
-#define USE_ENVIRONMENT
-#endif
-
-#ifdef __BEOS__
-#define typedef_bool
-#endif
-
-#if (defined(NETWARE) && !defined(__NOVELL_LIBC__))
-#include <sys/timeval.h>
-#endif
-
-#ifndef UNPRINTABLE_CHAR
-/* define what to use for unprintable characters */
-#define UNPRINTABLE_CHAR '.'
-#endif
-
-#ifndef HAVE_STRDUP
-#include "strdup.h"
-#define strdup(ptr) curlx_strdup(ptr)
-#endif
-
-/* Define S_ISREG if not defined by system headers, f.e. MSVC */
-#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)
-#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif
-
-/*
- * Include macros and defines that should only be processed once.
- */
-
-#ifndef __SETUP_ONCE_H
-#include "setup_once.h"
-#endif
-
-/*
- * Definition of our NOP statement Object-like macro
- */
-
-#ifndef Curl_nop_stmt
-# define Curl_nop_stmt do { } WHILE_FALSE
-#endif
-
-/*
- * Ensure that Winsock and lwIP TCP/IP stacks are not mixed.
- */
-
-#if defined(__LWIP_OPT_H__)
-# if defined(SOCKET) || \
- defined(USE_WINSOCK) || \
- defined(HAVE_ERRNO_H) || \
- defined(HAVE_WINSOCK_H) || \
- defined(HAVE_WINSOCK2_H) || \
- defined(HAVE_WS2TCPIP_H)
-# error "Winsock and lwIP TCP/IP stack definitions shall not coexist!"
-# endif
-#endif
-
-#endif /* HEADER_CURL_SRC_SETUP_H */
-
diff --git a/src/tool_binmode.c b/src/tool_binmode.c
index 34422fdef..92033ac03 100644
--- a/src/tool_binmode.c
+++ b/src/tool_binmode.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifdef HAVE_SETMODE
diff --git a/src/tool_binmode.h b/src/tool_binmode.h
index abd22e44d..b5cb08d55 100644
--- a/src/tool_binmode.h
+++ b/src/tool_binmode.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifdef HAVE_SETMODE
diff --git a/src/tool_bname.c b/src/tool_bname.c
index 2ac6e483b..277830546 100644
--- a/src/tool_bname.c
+++ b/src/tool_bname.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include "tool_bname.h"
diff --git a/src/tool_bname.h b/src/tool_bname.h
index ed7ba0632..69cf92c1b 100644
--- a/src/tool_bname.h
+++ b/src/tool_bname.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifndef HAVE_BASENAME
diff --git a/src/tool_cb_dbg.c b/src/tool_cb_dbg.c
index e92ad1ade..e3bee1bdb 100644
--- a/src/tool_cb_dbg.c
+++ b/src/tool_cb_dbg.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_cb_dbg.h b/src/tool_cb_dbg.h
index 6d4446da1..d0ed7b0d4 100644
--- a/src/tool_cb_dbg.h
+++ b/src/tool_cb_dbg.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
/*
** callback for CURLOPT_DEBUGFUNCTION
diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
index dea73387a..d222bbe24 100644
--- a/src/tool_cb_hdr.c
+++ b/src/tool_cb_hdr.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_cb_hdr.h b/src/tool_cb_hdr.h
index 8808a4ae1..5909336e6 100644
--- a/src/tool_cb_hdr.h
+++ b/src/tool_cb_hdr.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
/*
** callback for CURLOPT_HEADERFUNCTION
diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c
index 457c1a75d..5c8a4ad57 100644
--- a/src/tool_cb_prg.c
+++ b/src/tool_cb_prg.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_cb_prg.h b/src/tool_cb_prg.h
index f64335a3b..81915b2d5 100644
--- a/src/tool_cb_prg.h
+++ b/src/tool_cb_prg.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#define CURL_PROGRESS_STATS 0 /* default progress display */
#define CURL_PROGRESS_BAR 1
diff --git a/src/tool_cb_rea.c b/src/tool_cb_rea.c
index 34edb063b..ab03096a7 100644
--- a/src/tool_cb_rea.c
+++ b/src/tool_cb_rea.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_cb_rea.h b/src/tool_cb_rea.h
index 40c61f6f1..4294166a7 100644
--- a/src/tool_cb_rea.h
+++ b/src/tool_cb_rea.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
/*
** callback for CURLOPT_READFUNCTION
diff --git a/src/tool_cb_see.c b/src/tool_cb_see.c
index 5bac4947b..b44677eef 100644
--- a/src/tool_cb_see.c
+++ b/src/tool_cb_see.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_cb_see.h b/src/tool_cb_see.h
index 1c14a8f74..ceb22d65c 100644
--- a/src/tool_cb_see.h
+++ b/src/tool_cb_see.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#if defined(WIN32) && !defined(__MINGW64__)
diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c
index 2614ddcf5..df055471b 100644
--- a/src/tool_cb_wrt.c
+++ b/src/tool_cb_wrt.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_cb_wrt.h b/src/tool_cb_wrt.h
index a17c14607..380d8dd6a 100644
--- a/src/tool_cb_wrt.h
+++ b/src/tool_cb_wrt.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
/*
** callback for CURLOPT_WRITEFUNCTION
diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c
index 98342c4f6..a17db0bb0 100644
--- a/src/tool_cfgable.c
+++ b/src/tool_cfgable.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h
index 68204ed27..614f8b9b0 100644
--- a/src/tool_cfgable.h
+++ b/src/tool_cfgable.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include "tool_sdecls.h"
diff --git a/src/tool_convert.c b/src/tool_convert.c
index e72a091b6..93552ace4 100644
--- a/src/tool_convert.c
+++ b/src/tool_convert.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifdef CURL_DOES_CONVERSIONS
diff --git a/src/tool_convert.h b/src/tool_convert.h
index d3ef676b2..32d473f97 100644
--- a/src/tool_convert.h
+++ b/src/tool_convert.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifdef CURL_DOES_CONVERSIONS
diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c
index f538d8b2f..dae0937fb 100644
--- a/src/tool_dirhie.c
+++ b/src/tool_dirhie.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_dirhie.h b/src/tool_dirhie.h
index eee30c47f..5f19575d4 100644
--- a/src/tool_dirhie.h
+++ b/src/tool_dirhie.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
CURLcode create_dir_hierarchy(const char *outfile, FILE *errors);
diff --git a/src/tool_doswin.c b/src/tool_doswin.c
index ef3899ee9..02957dbb9 100644
--- a/src/tool_doswin.c
+++ b/src/tool_doswin.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#if defined(MSDOS) || defined(WIN32)
diff --git a/src/tool_doswin.h b/src/tool_doswin.h
index ce475acf9..955ce8d38 100644
--- a/src/tool_doswin.h
+++ b/src/tool_doswin.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#if defined(MSDOS) || defined(WIN32)
diff --git a/src/tool_easysrc.c b/src/tool_easysrc.c
index 59664bddf..24073d14e 100644
--- a/src/tool_easysrc.c
+++ b/src/tool_easysrc.c
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_easysrc.h b/src/tool_easysrc.h
index 1d2c02765..fa97cdcb3 100644
--- a/src/tool_easysrc.h
+++ b/src/tool_easysrc.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifndef CURL_DISABLE_LIBCURL_OPTION
/* global variable declarations, for easy-interface source code generation */
diff --git a/src/tool_formparse.c b/src/tool_formparse.c
index 248c89ce7..14003e7cc 100644
--- a/src/tool_formparse.c
+++ b/src/tool_formparse.c
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_formparse.h b/src/tool_formparse.h
index eebf507f4..3cd915f6c 100644
--- a/src/tool_formparse.h
+++ b/src/tool_formparse.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
int formparse(struct Configurable *config,
const char *input,
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index c9cf9e44d..642f5d286 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_getparam.h b/src/tool_getparam.h
index c402fd77b..0cd2c3972 100644
--- a/src/tool_getparam.h
+++ b/src/tool_getparam.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
typedef enum {
PARAM_OK,
diff --git a/src/tool_getpass.c b/src/tool_getpass.c
index b6aa5dd5e..a3fffa9b3 100644
--- a/src/tool_getpass.c
+++ b/src/tool_getpass.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifndef HAVE_GETPASS_R
/* this file is only for systems without getpass_r() */
diff --git a/src/tool_getpass.h b/src/tool_getpass.h
index 506d0feef..d4fc7e231 100644
--- a/src/tool_getpass.h
+++ b/src/tool_getpass.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifndef HAVE_GETPASS_R
/* If there's a system-provided function named like this, we trust it is
diff --git a/src/tool_help.c b/src/tool_help.c
index e5fea889f..e7e6d6c8b 100644
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include "tool_panykey.h"
#include "tool_help.h"
diff --git a/src/tool_help.h b/src/tool_help.h
index f9664113a..1b757dc80 100644
--- a/src/tool_help.h
+++ b/src/tool_help.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
void tool_help(void);
diff --git a/src/tool_helpers.c b/src/tool_helpers.c
index b6371785d..3faed6f4a 100644
--- a/src/tool_helpers.c
+++ b/src/tool_helpers.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_helpers.h b/src/tool_helpers.h
index 4385bfce4..c0bcd8910 100644
--- a/src/tool_helpers.h
+++ b/src/tool_helpers.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
const char *param2text(int res);
diff --git a/src/tool_homedir.c b/src/tool_homedir.c
index 95d25c74f..61cc02afb 100644
--- a/src/tool_homedir.c
+++ b/src/tool_homedir.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifdef HAVE_PWD_H
# include <pwd.h>
diff --git a/src/tool_homedir.h b/src/tool_homedir.h
index 109c1f282..d58861555 100644
--- a/src/tool_homedir.h
+++ b/src/tool_homedir.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
char *homedir(void);
diff --git a/src/tool_libinfo.c b/src/tool_libinfo.c
index 1469c8807..ba2f44325 100644
--- a/src/tool_libinfo.c
+++ b/src/tool_libinfo.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_libinfo.h b/src/tool_libinfo.h
index dfdf78a61..5c149d916 100644
--- a/src/tool_libinfo.h
+++ b/src/tool_libinfo.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
/* global variable declarations, for libcurl run-time info */
diff --git a/src/tool_main.c b/src/tool_main.c
index 86780c7f1..23d7df5e8 100644
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_main.h b/src/tool_main.h
index 2193cb96e..9a7972fdd 100644
--- a/src/tool_main.h
+++ b/src/tool_main.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#define DEFAULT_MAXREDIRS 50L
diff --git a/src/tool_mfiles.c b/src/tool_mfiles.c
index 17edbfaab..b609b6e80 100644
--- a/src/tool_mfiles.c
+++ b/src/tool_mfiles.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_mfiles.h b/src/tool_mfiles.h
index 8a3b53935..1ea6f4a47 100644
--- a/src/tool_mfiles.h
+++ b/src/tool_mfiles.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
/*
* Structure for storing the information needed to build
diff --git a/src/tool_msgs.c b/src/tool_msgs.c
index b6a80a2dd..80fdf4e27 100644
--- a/src/tool_msgs.c
+++ b/src/tool_msgs.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
diff --git a/src/tool_msgs.h b/src/tool_msgs.h
index 9102139bd..7b060894f 100644
--- a/src/tool_msgs.h
+++ b/src/tool_msgs.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
void warnf(struct Configurable *config, const char *fmt, ...);
diff --git a/src/tool_operate.c b/src/tool_operate.c
index bd0038d4a..38df6d2ca 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_operate.h b/src/tool_operate.h
index 4986cc4e3..5a0a4a06b 100644
--- a/src/tool_operate.h
+++ b/src/tool_operate.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
int operate(struct Configurable *config, int argc, argv_item_t argv[]);
diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c
index 4c1697b20..8b31f54aa 100644
--- a/src/tool_operhlp.c
+++ b/src/tool_operhlp.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_operhlp.h b/src/tool_operhlp.h
index 3629bf13a..806717ee0 100644
--- a/src/tool_operhlp.h
+++ b/src/tool_operhlp.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
char *my_useragent(void);
diff --git a/src/tool_panykey.c b/src/tool_panykey.c
index 95fa6a763..d8718e328 100644
--- a/src/tool_panykey.c
+++ b/src/tool_panykey.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#if defined(__SYMBIAN32__) || defined(NETWARE)
diff --git a/src/tool_panykey.h b/src/tool_panykey.h
index 30fd658d3..50b15d2db 100644
--- a/src/tool_panykey.h
+++ b/src/tool_panykey.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#if defined(__SYMBIAN32__) || defined(NETWARE)
diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
index 2d8e7f0d6..b09b33cd0 100644
--- a/src/tool_paramhlp.c
+++ b/src/tool_paramhlp.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_paramhlp.h b/src/tool_paramhlp.h
index f17999198..c65450915 100644
--- a/src/tool_paramhlp.h
+++ b/src/tool_paramhlp.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
struct getout *new_getout(struct Configurable *config);
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index b60d31830..8bcc00744 100644
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_parsecfg.h b/src/tool_parsecfg.h
index faa1f1924..aa7ac574b 100644
--- a/src/tool_parsecfg.h
+++ b/src/tool_parsecfg.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
int parseconfig(const char *filename,
struct Configurable *config);
diff --git a/src/tool_sdecls.h b/src/tool_sdecls.h
index 50365273b..3482538ec 100644
--- a/src/tool_sdecls.h
+++ b/src/tool_sdecls.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
/*
diff --git a/src/tool_setopt.c b/src/tool_setopt.c
index 94e786f24..d387af181 100644
--- a/src/tool_setopt.c
+++ b/src/tool_setopt.c
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifndef CURL_DISABLE_LIBCURL_OPTION
diff --git a/src/tool_setopt.h b/src/tool_setopt.h
index 4189addae..10134a6e7 100644
--- a/src/tool_setopt.h
+++ b/src/tool_setopt.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
/*
* Macros used in operate()
diff --git a/src/tool_setup.h b/src/tool_setup.h
new file mode 100644
index 000000000..c5c552c86
--- /dev/null
+++ b/src/tool_setup.h
@@ -0,0 +1,56 @@
+#ifndef HEADER_CURL_TOOL_SETUP_H
+#define HEADER_CURL_TOOL_SETUP_H
+/***************************************************************************
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
+ * \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2012, 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
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+
+#define CURL_NO_OLDIES
+
+#include "setup.h" /* from the lib directory */
+
+#if defined(macintosh) && defined(__MRC__)
+# define main(x,y) curl_main(x,y)
+#endif
+
+#ifdef TPF
+# undef select
+ /* change which select is used for the curl command line tool */
+# define select(a,b,c,d,e) tpf_select_bsd(a,b,c,d,e)
+ /* and turn off the progress meter */
+# define CONF_DEFAULT (0|CONF_NOPROGRESS)
+#endif
+
+#ifndef OS
+# define OS "unknown"
+#endif
+
+#ifndef UNPRINTABLE_CHAR
+ /* define what to use for unprintable characters */
+# define UNPRINTABLE_CHAR '.'
+#endif
+
+#ifndef HAVE_STRDUP
+# include "strdup.h"
+# define strdup(ptr) curlx_strdup(ptr)
+#endif
+
+#endif /* HEADER_CURL_TOOL_SETUP_H */
+
diff --git a/src/tool_sleep.c b/src/tool_sleep.c
index 08db8861b..835484025 100644
--- a/src/tool_sleep.c
+++ b/src/tool_sleep.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifdef HAVE_SYS_SELECT_H
# include <sys/select.h>
diff --git a/src/tool_sleep.h b/src/tool_sleep.h
index 29655cedd..115a4e404 100644
--- a/src/tool_sleep.h
+++ b/src/tool_sleep.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
void tool_go_sleep(long ms);
diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c
index f5c09a1e8..de815dce4 100644
--- a/src/tool_urlglob.c
+++ b/src/tool_urlglob.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_urlglob.h b/src/tool_urlglob.h
index 18281bf61..9c37f1560 100644
--- a/src/tool_urlglob.h
+++ b/src/tool_urlglob.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
typedef enum {
UPTSet = 1,
diff --git a/src/tool_util.c b/src/tool_util.c
index 93ab17fd4..00d205ebc 100644
--- a/src/tool_util.c
+++ b/src/tool_util.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include "tool_util.h"
diff --git a/src/tool_util.h b/src/tool_util.h
index 7c2a2978a..d8bb03669 100644
--- a/src/tool_util.h
+++ b/src/tool_util.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
struct timeval tool_tvnow(void);
diff --git a/src/tool_vms.c b/src/tool_vms.c
index b1ecfe551..9d9bcc1d4 100644
--- a/src/tool_vms.c
+++ b/src/tool_vms.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifdef __VMS
diff --git a/src/tool_vms.h b/src/tool_vms.h
index 56db34ba1..5bb262e2e 100644
--- a/src/tool_vms.h
+++ b/src/tool_vms.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifdef __VMS
diff --git a/src/tool_writeenv.c b/src/tool_writeenv.c
index 232ab697c..166e6d97f 100644
--- a/src/tool_writeenv.c
+++ b/src/tool_writeenv.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifdef USE_ENVIRONMENT
diff --git a/src/tool_writeenv.h b/src/tool_writeenv.h
index 74fdc97d9..c0a952fe0 100644
--- a/src/tool_writeenv.h
+++ b/src/tool_writeenv.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifdef USE_ENVIRONMENT
diff --git a/src/tool_writeout.c b/src/tool_writeout.c
index 361f3657e..760d4bfb8 100644
--- a/src/tool_writeout.c
+++ b/src/tool_writeout.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#include <curl/curl.h>
diff --git a/src/tool_writeout.h b/src/tool_writeout.h
index 23447496c..4dd3a75a5 100644
--- a/src/tool_writeout.h
+++ b/src/tool_writeout.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
void ourWriteOut(CURL *curl, struct OutStruct *outs, const char *writeinfo);
diff --git a/src/tool_xattr.c b/src/tool_xattr.c
index 1f3883fa6..9c7e7049c 100644
--- a/src/tool_xattr.c
+++ b/src/tool_xattr.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
#ifdef HAVE_FSETXATTR
# include <sys/xattr.h> /* header from libc, not from libattr */
diff --git a/src/tool_xattr.h b/src/tool_xattr.h
index 14c8c944b..3f8f585e4 100644
--- a/src/tool_xattr.h
+++ b/src/tool_xattr.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "tool_setup.h"
int fwrite_xattr(CURL *curl, int fd);
diff --git a/src/vc6curlsrc.dsp b/src/vc6curlsrc.dsp
index 5866f011a..a2d9e7bf9 100644
--- a/src/vc6curlsrc.dsp
+++ b/src/vc6curlsrc.dsp
@@ -311,10 +311,6 @@ SOURCE=.\hugehelp.h
# End Source File
# Begin Source File
-SOURCE=.\setup.h
-# End Source File
-# Begin Source File
-
SOURCE=..\lib\nonblock.h
# End Source File
# Begin Source File
@@ -447,6 +443,10 @@ SOURCE=.\tool_setopt.h
# End Source File
# Begin Source File
+SOURCE=.\tool_setup.h
+# End Source File
+# Begin Source File
+
SOURCE=.\tool_sleep.h
# End Source File
# Begin Source File