diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/common-xp.vcxproj | 2 | ||||
| -rw-r--r-- | src/common/common-xp.vcxproj.filters | 2 | ||||
| -rw-r--r-- | src/common/common.vcxproj | 2 | ||||
| -rw-r--r-- | src/common/common.vcxproj.filters | 2 | ||||
| -rw-r--r-- | src/common/hexchat.h | 4 | ||||
| -rw-r--r-- | src/common/inet.h | 2 | ||||
| -rw-r--r-- | src/common/network.c | 7 | ||||
| -rw-r--r-- | src/common/ssl.c | 4 | ||||
| -rw-r--r-- | src/common/util.c | 3 |
9 files changed, 18 insertions, 10 deletions
diff --git a/src/common/common-xp.vcxproj b/src/common/common-xp.vcxproj index 736eacb1..3d2e0bd1 100644 --- a/src/common/common-xp.vcxproj +++ b/src/common/common-xp.vcxproj @@ -11,7 +11,7 @@ </ProjectConfiguration> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\config.h" /> + <ClInclude Include="..\..\config-win32.h" /> <ClInclude Include="cfgfiles.h" /> <ClInclude Include="chanopt.h" /> <ClInclude Include="ctcp.h" /> diff --git a/src/common/common-xp.vcxproj.filters b/src/common/common-xp.vcxproj.filters index 3707caa0..ceeea660 100644 --- a/src/common/common-xp.vcxproj.filters +++ b/src/common/common-xp.vcxproj.filters @@ -107,7 +107,7 @@ <ClInclude Include="hexchat-plugin.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\config.h"> + <ClInclude Include="..\..\config-win32.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="strlutil.h"> diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 9bb79ac5..9f3c0990 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -11,7 +11,7 @@ </ProjectConfiguration> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\config.h" /> + <ClInclude Include="..\..\config-win32.h" /> <ClInclude Include="cfgfiles.h" /> <ClInclude Include="chanopt.h" /> <ClInclude Include="ctcp.h" /> diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters index 3707caa0..ceeea660 100644 --- a/src/common/common.vcxproj.filters +++ b/src/common/common.vcxproj.filters @@ -107,7 +107,7 @@ <ClInclude Include="hexchat-plugin.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\config.h"> + <ClInclude Include="..\..\config-win32.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="strlutil.h"> diff --git a/src/common/hexchat.h b/src/common/hexchat.h index 9b5ebf04..5ad6a383 100644 --- a/src/common/hexchat.h +++ b/src/common/hexchat.h @@ -1,4 +1,8 @@ +#ifdef WIN32 +#include "../../config-win32.h" +#else #include "../../config.h" +#endif #include <glib.h> #include <time.h> /* need time_t */ diff --git a/src/common/inet.h b/src/common/inet.h index 8995569c..75e2fb01 100644 --- a/src/common/inet.h +++ b/src/common/inet.h @@ -21,7 +21,7 @@ #else -#include "../../config.h" +#include "../../config-win32.h" #ifdef USE_IPV6 #include <winsock2.h> #include <ws2tcpip.h> diff --git a/src/common/network.c b/src/common/network.c index eba24b05..f8722433 100644 --- a/src/common/network.c +++ b/src/common/network.c @@ -23,12 +23,13 @@ #include <stdio.h> #include <glib.h> -#ifndef WIN32 +#ifdef WIN32 +#include "../../config-win32.h" /* grab USE_IPV6 and LOOKUPD defines */ +#else #include <unistd.h> +#include "../../config.h" #endif -#include "../../config.h" /* grab USE_IPV6 and LOOKUPD defines */ - #define WANTSOCKET #define WANTARPA #define WANTDNS diff --git a/src/common/ssl.c b/src/common/ssl.c index 04fb6ac5..1ee42a08 100644 --- a/src/common/ssl.c +++ b/src/common/ssl.c @@ -22,11 +22,13 @@ #include <openssl/err.h> /* ERR_() */ #ifdef WIN32 #include <openssl/rand.h> /* RAND_seed() */ +#include "../../config-win32.h" /* HAVE_SNPRINTF */ +#else +#include "../../config.h" #endif #include <time.h> /* asctime() */ #include <string.h> /* strncpy() */ #include "ssl.h" /* struct cert_info */ -#include "../../config.h" /* HAVE_SNPRINTF */ #ifndef HAVE_SNPRINTF #include <glib.h> diff --git a/src/common/util.c b/src/common/util.c index 0881c708..8f76cfc6 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -33,12 +33,14 @@ #include <process.h> #include <io.h> #include "../dirent/dirent-win32.h" +#include "../../config-win32.h" #else #include <unistd.h> #include <pwd.h> #include <sys/time.h> #include <sys/utsname.h> #include <dirent.h> +#include "../../config.h" #endif #include <fcntl.h> @@ -48,7 +50,6 @@ #include <glib.h> #include <ctype.h> #include "util.h" -#include "../../config.h" #if defined (USING_FREEBSD) || defined (__APPLE__) #include <sys/sysctl.h> |