Changeset 4657Tweet

Timestamp:

Sep 23, 2010, 12:18:07 AM (8 years ago)

Author:

Sam Hocevar

Message:

Fix the Linux build to accomodate with the new Win32 features.

Location:

zzuf/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• libzzuf/lib-load.h (modified) (3 diffs)
• libzzuf/lib-stream.c (modified) (2 diffs)
• libzzuf/lib-win32.c (modified) (4 diffs)

zzuf/trunk/src/Makefile.am

@@ -15 +15 @@
     libzzuf/network.c libzzuf/network.h \
     libzzuf/lib-fd.c libzzuf/lib-mem.c libzzuf/lib-signal.c \
-    libzzuf/lib-stream.c libzzuf/lib-load.h
+    libzzuf/lib-stream.c libzzuf/lib-win32.c libzzuf/lib-load.h
 
 COMMON = \

zzuf/trunk/src/libzzuf/lib-load.h

@@ -19 +19 @@
 #define ORIG(x) x##_orig
 
-#ifdef HAVE_DLFCN_H
+#if defined HAVE_DLFCN_H
 #   include <dlfcn.h>
 #   define NEW(x) x
@@ -35 +35 @@
                 abort(); \
         } while(0)
-#else
+#elif defined _WIN32
 #   define NEW(x) x##_new
 #   define LOADSYM(x) \
@@ -57 +57 @@
                     table_win32[];
 
+#else
+#   error no function diversion system for this platform
 #endif
+

zzuf/trunk/src/libzzuf/lib-stream.c

@@ -1148 +1148 @@
 
 /* Win32 function table */
+#if defined _WIN32
 zzuf_table_t table_stream[] =
 {
@@ -1155 +1156 @@
     DIVERT_END
 };
+#endif
+

zzuf/trunk/src/libzzuf/lib-win32.c

@@ -17 +17 @@
 #include "config.h"
 
+#if defined HAVE_STDINT_H
+#   include <stdint.h>
+#elif defined HAVE_INTTYPES_H
+#   include <inttypes.h>
+#endif
+
+#include <stdio.h>
+
 #if defined HAVE_WINDOWS_H
 #   include <windows.h>
 #endif
-
-#include <stdio.h>
 
 #include "common.h"
@@ -38 +44 @@
 #endif
 
+#if defined HAVE_CREATEFILE
 HANDLE NEW(CreateFileA)(LPCTSTR lpFileName, DWORD dwDesiredAccess,
            DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes,
@@ -48 +55 @@
                              dwFlagsAndAttributes, hTemplateFile);
 }
+#endif
 
 /* Win32 function table */
+#if defined _WIN32
 zzuf_table_t table_win32[] =
 {
@@ -57 +66 @@
     DIVERT_END
 };
+#endif