diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/config-symbian.h | 17 | ||||
| -rw-r--r-- | lib/urldata.h | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/lib/config-symbian.h b/lib/config-symbian.h index d35443f2c..70c2a5803 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -291,9 +291,6 @@ /* Define to 1 if you have the `ssl' library (-lssl). */ /*#define HAVE_LIBSSL 1*/ -/* if zlib is available */ -/*#define HAVE_LIBZ 1*/ - /* Define to 1 if you have the <limits.h> header file. */ #define HAVE_LIMITS_H 1 @@ -619,9 +616,6 @@ /* Define to 1 if you have the <x509.h> header file. */ /* #undef HAVE_X509_H */ -/* if you have the zlib.h header file */ -/*#define HAVE_ZLIB_H 1*/ - /* Define to 1 if you are building a native Windows target. */ /* #undef NATIVE_WINDOWS */ @@ -798,3 +792,14 @@ #ifndef __LONG_LONG_SUPPORTED #define __LONG_LONG_SUPPORTED #endif + +/* Enable appropriate header only when zlib support is enabled */ +#ifdef HAVE_LIBZ +#define HAVE_ZLIB_H 1 +#endif + +/* Enable appropriate definitions only when OpenSSL support is enabled */ +#ifdef USE_SSL +#define USE_OPENSSL 1 +#define USE_SSLEAY 1 +#endif diff --git a/lib/urldata.h b/lib/urldata.h index c6d8bf17f..4113f3a51 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -106,6 +106,10 @@ #ifdef HAVE_ZLIB_H #include <zlib.h> /* for content-encoding */ +#ifdef __SYMBIAN32__ +/* zlib pollutes the namespace with this definition */ +#undef WIN32 +#endif #endif #ifdef USE_ARES |