diff options
| author | Yang Tse <yangsita@gmail.com> | 2008-07-14 12:39:50 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2008-07-14 12:39:50 +0000 |
| commit | fe7bb33af8d8b4e0ede43b4fa1caf7d8b00c7966 (patch) | |
| tree | 7972712642de31e4a187ec74678ebb91606447ce | |
| parent | da6fa34f021c5dfd3d0ecc9de6950497dc1a737a (diff) | |
HTTP_ONLY definition check in lib/setup.h is now done once that configuration
file has been included. In this way if symbol is defined in the config file
it will no longer be ignored.
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | docs/INSTALL | 2 | ||||
| -rw-r--r-- | lib/setup.h | 22 |
3 files changed, 20 insertions, 9 deletions
@@ -6,6 +6,11 @@ Changelog +Yang Tse (14 Jul 2008) +- HTTP_ONLY definition check in lib/setup.h is now done once that configuration + file has been included. In this way if symbol is defined in the config file + it will no longer be ignored. + Yang Tse (11 Jul 2008) - Added missing multiple header inclusion prevention definition for header file content_encoding.h diff --git a/docs/INSTALL b/docs/INSTALL index 4b2928b2b..6b0fd039c 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -332,10 +332,12 @@ Win32 CURL_DISABLE_DICT disables DICT CURL_DISABLE_FILE disables FILE CURL_DISABLE_TFTP disables TFTP + CURL_DISABLE_HTTP disables HTTP If you want to set any of these defines you have the following possibilities: + - Modify lib/config-win32.h - Modify lib/setup.h - Modify lib/Makefile.vc6 - Add defines to Project/Settings/C/C++/General/Preprocessor Definitions diff --git a/lib/setup.h b/lib/setup.h index 1f8505d13..dca6da42d 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -23,15 +23,6 @@ * $Id$ ***************************************************************************/ -#ifdef HTTP_ONLY -#define CURL_DISABLE_TFTP -#define CURL_DISABLE_FTP -#define CURL_DISABLE_LDAP -#define CURL_DISABLE_TELNET -#define CURL_DISABLE_DICT -#define CURL_DISABLE_FILE -#endif /* HTTP_ONLY */ - /* * Define WIN32 when build target is Win32 API */ @@ -83,6 +74,19 @@ #endif /* HAVE_CONFIG_H */ /* + * Disable other protocols when http is the only one desired. + */ + +#ifdef HTTP_ONLY +# define CURL_DISABLE_TFTP +# define CURL_DISABLE_FTP +# define CURL_DISABLE_LDAP +# define CURL_DISABLE_TELNET +# define CURL_DISABLE_DICT +# define CURL_DISABLE_FILE +#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 |