file_util.c is only for Windows; don't build it on UN*X. Put in a check

to cause it to fail when built on UN*X, and get rid of code that's not
needed on Windows.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25362 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index ee8459f7275cd577f7cfd0e33097846a9fa1fb74..0db6f976017e35e1deefff3b73e722bd44e08e03 100644 (file)
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@@ -39,8 +39,10 @@ libwsutil_la_SOURCES =       \
 libwsutil_la_LIBADD = @GLIB_LIBS@
 
 EXTRA_DIST = \
-       Makefile.common         \
-       Makefile.nmake
+       Makefile.common \
+       Makefile.nmake  \
+       file_util.c     \
+       file_util.h 
 
 CLEANFILES = \
        libwsutil.a     \

diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index cde374581c4304726f6ac03dda8256f52ee28e7b..6684c8faad1374ddbcd84acb0fe86f78a251d596 100644 (file)
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -29,10 +29,8 @@
 # generated from YACC or Lex files (as Automake doesn't want them in
 # _SOURCES variables).
 LIBWSUTIL_SRC = \
-       file_util.c     \
        mpeg-audio.c
 
 # Header files that are not generated from other files
 LIBWSUTIL_INCLUDES = \
-       file_util.h     \
        mpeg-audio.h

diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake
index 19af589ecda38b795e21ff6693d9c61ece3ac5f1..be5b7001d1be0b952f412e4e79d2c8d961571aaf 100644 (file)
--- a/wsutil/Makefile.nmake
+++ b/wsutil/Makefile.nmake
@@ -22,7 +22,7 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 # For use when making libwsutil.dll
 libwsutil_LIBS = $(GLIB_LIBS)
 
-OBJECTS = $(LIBWSUTIL_SRC:.c=.obj)
+OBJECTS = file_util.obj $(LIBWSUTIL_SRC:.c=.obj)
 
 
 # For use when making libwsutil.dll

diff --git a/wsutil/file_util.c b/wsutil/file_util.c
index fb30b6f18a17b986103effe2b1fdbeaad5ba2f5b..7f20e4d78539a7c55eef7b470e942bf489ac713b 100644 (file)
--- a/wsutil/file_util.c
+++ b/wsutil/file_util.c
@@ -30,19 +30,21 @@
  * the following code is stripped down code copied from the GLib file glib/gstdio.h
  * stipped down, because this is used on _WIN32 only and we use only wide char functions */
 
+#ifndef _WIN32
+#error "This is only for Windows"
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <glib.h>
 
-#ifdef _WIN32
 #include <windows.h>
 #include <errno.h>
 #include <wchar.h>
 /*#include <direct.h>*/
 #include <io.h>
-#endif
 
 #include "file_util.h"
 
@@ -74,8 +76,6 @@ ws_stdio_open (const gchar *filename,
        int          flags,
        int          mode)
 {
-#ifdef _WIN32
-    {
       wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
       int retval;
       int save_errno;
@@ -93,10 +93,6 @@ ws_stdio_open (const gchar *filename,
 
       errno = save_errno;
       return retval;
-    }
-#else
-  return open (filename, flags, mode);
-#endif
 }
 
 
@@ -121,7 +117,6 @@ int
 ws_stdio_rename (const gchar *oldfilename,
          const gchar *newfilename)
 {
-#ifdef _WIN32
       wchar_t *woldfilename = g_utf8_to_utf16 (oldfilename, -1, NULL, NULL, NULL);
       wchar_t *wnewfilename;
       int retval;
@@ -168,9 +163,6 @@ ws_stdio_rename (const gchar *oldfilename,
 
       errno = save_errno;
       return retval;
-#else
-  return rename (oldfilename, newfilename);
-#endif
 }
 
 /**
@@ -192,7 +184,6 @@ int
 ws_stdio_mkdir (const gchar *filename,
         int          mode)
 {
-#ifdef _WIN32
       wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
       int retval;
       int save_errno;
@@ -210,9 +201,6 @@ ws_stdio_mkdir (const gchar *filename,
 
       errno = save_errno;
       return retval;
-#else
-  return mkdir (filename, mode);
-#endif
 }
 
 /**
@@ -235,7 +223,6 @@ int
 ws_stdio_stat (const gchar *filename,
        struct stat *buf)
 {
-#ifdef _WIN32
       wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
       int retval;
       int save_errno;
@@ -261,9 +248,6 @@ ws_stdio_stat (const gchar *filename,
 
       errno = save_errno;
       return retval;
-#else
-  return stat (filename, buf);
-#endif
 }
 
 /**
@@ -287,7 +271,6 @@ ws_stdio_stat (const gchar *filename,
 int
 ws_stdio_unlink (const gchar *filename)
 {
-#ifdef _WIN32
       gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
       int retval;
       int save_errno;
@@ -305,9 +288,6 @@ ws_stdio_unlink (const gchar *filename)
 
       errno = save_errno;
       return retval;
-#else
-  return unlink (filename);
-#endif
 }
 
 /**
@@ -339,7 +319,6 @@ ws_stdio_unlink (const gchar *filename)
 int
 ws_stdio_remove (const gchar *filename)
 {
-#ifdef _WIN32
       wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
       int retval;
       int save_errno;
@@ -359,9 +338,6 @@ ws_stdio_remove (const gchar *filename)
 
       errno = save_errno;
       return retval;
-#else
-  return remove (filename);
-#endif
 }
 
 /**
@@ -384,7 +360,6 @@ FILE *
 ws_stdio_fopen (const gchar *filename,
         const gchar *mode)
 {
-#ifdef _WIN32
       wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
       wchar_t *wmode;
       FILE *retval;
@@ -413,9 +388,6 @@ ws_stdio_fopen (const gchar *filename,
 
       errno = save_errno;
       return retval;
-#else
-  return fopen (filename, mode);
-#endif
 }
 
 /**
@@ -440,7 +412,6 @@ ws_stdio_freopen (const gchar *filename,
           const gchar *mode,
           FILE        *stream)
 {
-#ifdef _WIN32
       wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
       wchar_t *wmode;
       FILE *retval;
@@ -469,8 +440,4 @@ ws_stdio_freopen (const gchar *filename,
 
       errno = save_errno;
       return retval;
-#else
-  return freopen (filename, mode, stream);
-#endif
 }
-