Fix Windows builds (Issue #801)

diff --git a/cups/globals.c b/cups/globals.c
index 41fd595d5f2555fa126fef32ed40a5d868b01df5..cf036da37e929279fb21dfb3de940b799f492ea4 100644 (file)
--- a/cups/globals.c
+++ b/cups/globals.c
@@ -137,7 +137,7 @@ DllMain(HINSTANCE hinst,            /* I - DLL module handle */
   switch (reason)
   {
     case DLL_PROCESS_ATTACH :          /* Called on library initialization */
-        InitializeCriticalSection(&cups_global_mutex.m_criticalSection);
+        cupsMutexInit(&cups_global_mutex);
 
         if ((cups_globals_key = TlsAlloc()) == TLS_OUT_OF_INDEXES)
           return (FALSE);
@@ -153,7 +153,7 @@ DllMain(HINSTANCE hinst,            /* I - DLL module handle */
           cups_globals_free(cg);
 
         TlsFree(cups_globals_key);
-        DeleteCriticalSection(&cups_global_mutex.m_criticalSection);
+       cupsMutexDestroy(&cups_global_mutex);
         break;
 
     default:

diff --git a/cups/json.c b/cups/json.c
index a803d7403adb63f1983d6866194dd1b4b20c3273..23ff1fb8b834cf27a6dde0a822c05efde1b6096e 100644 (file)
--- a/cups/json.c
+++ b/cups/json.c
@@ -10,6 +10,7 @@
 #include "cups-private.h"
 #include "json-private.h"
 #include <sys/stat.h>
+#include <fcntl.h>
 
 
 //

diff --git a/cups/libcups2.def b/cups/libcups2.def
index 52681e00a06436551014f076ad56e67d0b9db33f..48b2475dd880a7d32739987b513a3286a60cac6c 100644 (file)
--- a/cups/libcups2.def
+++ b/cups/libcups2.def
@@ -61,12 +61,10 @@ _cups_cupsConcatString
 _cups_cupsCopyString
 _cups_gettimeofday
 _cups_safe_vsnprintf
-_cups_snprintf
 _cups_strcasecmp
 _cups_strcpy
 _cups_strcpy
 _cups_strncasecmp
-_cups_vsnprintf
 _httpCreateCredentials
 _httpDecodeURI
 _httpDisconnect
@@ -229,6 +227,7 @@ cupsFileGetChar
 cupsFileGetConf
 cupsFileGetLine
 cupsFileGets
+cupsFileIsCompressed
 cupsFileLock
 cupsFileNumber
 cupsFileOpen

diff --git a/cups/string-private.h b/cups/string-private.h
index fc21ff01f0e9f7399f7c52405cc87f1084676b3d..562c7238c6b85ea3a209e27f50f21f881e71de8c 100644 (file)
--- a/cups/string-private.h
+++ b/cups/string-private.h
@@ -11,7 +11,7 @@
 
 #ifndef _CUPS_STRING_PRIVATE_H_
 #  define _CUPS_STRING_PRIVATE_H_
-#  include "config.h"
+#  include <config.h>
 #  include <stdio.h>
 #  include <stdlib.h>
 #  include <stdarg.h>

diff --git a/tools/ipptool.c b/tools/ipptool.c
index f485b457e7ab097f0e7272f665bf3142fa265d08..79446aa5af8c386e7d70f407ca010dcc64a7d5ec 100644 (file)
--- a/tools/ipptool.c
+++ b/tools/ipptool.c
@@ -18,6 +18,7 @@
 #include <cups/raster-testpage.h>
 #include <regex.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #ifdef _WIN32
 #  include <windows.h>
 #  ifndef R_OK

diff --git a/vcnet/libcups2.vcxproj b/vcnet/libcups2.vcxproj
index 05b2b6349ca5459acf7a0e8633a3b8702916357a..01e6db5ab61a93e1ed76be686bffda15601e7b8a 100644 (file)
--- a/vcnet/libcups2.vcxproj
+++ b/vcnet/libcups2.vcxproj
@@ -175,6 +175,7 @@
   <ItemGroup>
     <ClInclude Include="..\cups\adminutil.h" />
     <ClInclude Include="..\cups\array.h" />
+    <ClInclude Include="..\cups\base.h" />
     <ClInclude Include="..\cups\cups-private.h" />
     <ClInclude Include="..\cups\cups.h" />
     <ClInclude Include="..\cups\debug-internal.h" />
@@ -205,7 +206,6 @@
     <ClInclude Include="..\cups\string-private.h" />
     <ClInclude Include="..\cups\thread.h" />
     <ClInclude Include="..\cups\transcode.h" />
-    <ClInclude Include="..\cups\versioning.h" />
     <ClInclude Include="config.h" />
   </ItemGroup>
   <ItemGroup>

diff --git a/vcnet/libcups2.vcxproj.filters b/vcnet/libcups2.vcxproj.filters
index f2c07a9f66234716d0b6f6648cd4de70121a9de0..6744f23874f6c587f867ff2c7016f350117cad87 100644 (file)
--- a/vcnet/libcups2.vcxproj.filters
+++ b/vcnet/libcups2.vcxproj.filters
@@ -174,7 +174,19 @@
     <ClCompile Include="..\cups\ipp-file.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\cups\ipp-vars.c">
+    <ClCompile Include="..\cups\dnssd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\cups\form.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\cups\json.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\cups\jwt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\cups\rand.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -254,9 +266,6 @@
     <ClInclude Include="..\cups\raster-private.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cups\versioning.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\cups\language-private.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -266,5 +275,29 @@
     <ClInclude Include="..\cups\pwg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\cups\dnssd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\cups\form.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\cups\json.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\cups\json-private.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\cups\jwt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\cups\raster-testpage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\cups\debug-internal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\cups\base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file