win32: Use config.h instead of config-win32.h

plugins/perl/perl.c

@@ -32,11 +32,8 @@
 #endif
 
 #undef PACKAGE
-#ifdef WIN32
-#include "../../config-win32.h"		  /* for #define OLD_PERL */
-#else
 #include "../../config.h"
-#endif
+
 #include "hexchat-plugin.h"
 
 static hexchat_plugin *ph;		  /* plugin handle */

plugins/python/python.c

@@ -60,12 +60,12 @@
 #include <direct.h>
 #include <glib/gstdio.h>
 #include "../../src/dirent/dirent-win32.h"
-#include "../../config-win32.h"
 #else
 #include <unistd.h>
 #include <dirent.h>
 #endif
 
+#include "../../config.h"
 #include "hexchat-plugin.h"
 #undef _POSIX_C_SOURCE	/* Avoid warning: also in /usr/include/features.h from glib.h */
 #include <Python.h>

src/common/common.vcxproj

@@ -77,8 +77,8 @@
     <ClCompile Include="hexchat.c" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\config-win32.h.tt" />
+    <None Include="..\..\win32\config.h.tt" />
-    <ClInclude Include="..\..\config-win32.h" />
+    <ClInclude Include="..\..\config.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{87554B59-006C-4D94-9714-897B27067BA3}</ProjectGuid>
@@ -160,7 +160,7 @@
     <PreBuildEvent>
       <Command><![CDATA[
 SET SOLUTIONDIR=$(SolutionDir)..\
-powershell -File "$(SolutionDir)..\version-template.ps1" "$(SolutionDir)..\config-win32.h.tt" "$(SolutionDir)..\config-win32.h"
+powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\config.h.tt" "$(SolutionDir)..\config.h"
 "$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --header "$(ProjectDir)marshalers.list" > "$(ProjectDir)marshal.h"
 "$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --body "$(ProjectDir)marshalers.list" > "$(ProjectDir)marshal.c"
 

src/common/common.vcxproj.filters

@@ -104,7 +104,7 @@
     <ClInclude Include="hexchat-plugin.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\config-win32.h">
+    <ClInclude Include="..\..\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="typedef.h">
@@ -195,6 +195,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\config-win32.h.tt" />
+    <None Include="..\..\win32\config.h.tt" />
   </ItemGroup>
 </Project>

src/common/hexchat.h

@@ -17,11 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifdef WIN32
-#include "../../config-win32.h"
-#else
 #include "../../config.h"
-#endif
 
 #include <glib.h>
 #include <glib/gstdio.h>

src/common/inet.h

@@ -47,7 +47,7 @@
 
 #else
 
-#include "../../config-win32.h"
+#include "../../config.h"
 #ifdef USE_IPV6
 #include <winsock2.h>
 #include <ws2tcpip.h>

src/common/network.c

@@ -23,12 +23,10 @@
 #include <stdio.h>
 #include <glib.h>
 
-#ifdef WIN32
+#ifndef WIN32
-#include "../../config-win32.h"			/* grab USE_IPV6 and LOOKUPD defines */
-#else
 #include <unistd.h>
-#include "../../config.h"
 #endif
+#include "../../config.h"
 
 #define WANTSOCKET
 #define WANTARPA

src/common/ssl.c

@@ -27,10 +27,8 @@
 #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 "../../config.h"
 #include <time.h>				  /* asctime() */
 #include <string.h>				  /* strncpy() */
 #include "ssl.h"				  /* struct cert_info */

src/common/util.c

@@ -35,16 +35,15 @@
 #include <io.h>
 #include <VersionHelpers.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 "../../config.h"
 #include <fcntl.h>
 #include <errno.h>
 #include "hexchat.h"

src/fe-gtk/fe-gtk.h

@@ -20,11 +20,7 @@
 #ifndef HEXCHAT_FE_GTK_H
 #define HEXCHAT_FE_GTK_H
 
-#ifdef WIN32
-#include "../../config-win32.h"
-#else
 #include "../../config.h"
-#endif
 
 #define DISPLAY_NAME "HexChat"
 

src/fe-gtk/fe-gtk.vcxproj

@@ -99,7 +99,7 @@
     <PreBuildEvent>
       <Command><![CDATA[
 SET SOLUTIONDIR=$(SolutionDir)..\
-powershell -File "$(SolutionDir)..\version-template.ps1" "$(SolutionDir)..\src\fe-gtk\hexchat.rc.tt" "$(SolutionDir)..\src\fe-gtk\hexchat.rc.utf8"
+powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\src\fe-gtk\hexchat.rc.tt" "$(SolutionDir)..\src\fe-gtk\hexchat.rc.utf8"
 REM hexchat.rc needs to be in UCS-2 or Resource Compiler will complain
 powershell "Get-Content -Encoding UTF8 '$(SolutionDir)..\src\fe-gtk\hexchat.rc.utf8' | Out-File '$(SolutionDir)..\src\fe-gtk\hexchat.rc'; Remove-Item '$(SolutionDir)..\src\fe-gtk\hexchat.rc.utf8'"
 "$(DepsRoot)\bin\glib-compile-resources.exe" --generate-source --sourcedir "$(DataDir)" --target "$(ProjectDir)resources.c" "$(DataDir)hexchat.gresource.xml"

src/fe-gtk/hexchat.rc.tt

@@ -1,5 +1,5 @@
 #include <winver.h>
-#include "../../config-win32.h"
+#include "../../config.h"
 
 #define COMMA_VERSION <#= [string]::Join(',', $versionParts) #>,0
 

src/fe-gtk/sexy-iso-codes.c

@@ -22,12 +22,7 @@
 #include "sexy-iso-codes.h"
 #include <libintl.h>
 #include <string.h>
-
-#ifdef G_OS_WIN32
-#include "../../config-win32.h"
-#else
 #include "../../config.h"
-#endif
 
 #define ISO_639_DOMAIN	"iso_639"
 #define ISO_3166_DOMAIN	"iso_3166"

src/fe-gtk/xtext.c

@@ -31,12 +31,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-#ifdef WIN32
-#include "../../config-win32.h"
-#else
 #include "../../config.h"
-#endif
-
 #include "../common/hexchat.h"
 #include "../common/fe.h"
 #include "../common/util.h"