Ignore generated config.h properly on Unix

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" />

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">

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" />

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">

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 */

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>

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

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>

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>