diff options
| author | Gerald Combs <gerald@wireshark.org> | 2010-08-25 22:41:26 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2010-08-25 22:41:26 +0000 |
| commit | 58f1427305fce718713f9339fed5104c30bbac5d (patch) | |
| tree | e828217a7b0b427a66771a33a6b50060caae4c3a /wsutil | |
| parent | 607b228df6f1f754bf9bda6cfa21563913b1e7ff (diff) | |
Move Windows-specific material inside an appropriate #ifdef.
svn path=/trunk/; revision=33925
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/file_util.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/wsutil/file_util.h b/wsutil/file_util.h index bf5689905a..3427d417ad 100644 --- a/wsutil/file_util.h +++ b/wsutil/file_util.h @@ -97,23 +97,6 @@ extern FILE * ws_stdio_freopen (const gchar *filename, const gchar *mode, FILE * #define ws_close _close #define ws_dup _dup #define ws_lseek _lseek -#else -#define ws_read read -#define ws_write write -#define ws_close close -#define ws_dup dup -#define ws_lseek lseek -#define O_BINARY 0 /* Win32 needs the O_BINARY flag for open() */ -#endif /* _WIN32 */ - -/* directory handling */ -#define WS_DIR GDir -#define WS_DIRENT const char -#define ws_dir_open g_dir_open -#define ws_dir_read_name g_dir_read_name -#define ws_dir_get_name(dirent) dirent -#define ws_dir_rewind g_dir_rewind -#define ws_dir_close g_dir_close /* DLL loading */ @@ -133,6 +116,23 @@ void *ws_load_library(gchar *library_name); * @return A handle to the DLL if found, NULL on failure. */ GModule *ws_module_open(gchar *module_name, GModuleFlags flags); +#else /* _WIN32 */ +#define ws_read read +#define ws_write write +#define ws_close close +#define ws_dup dup +#define ws_lseek lseek +#define O_BINARY 0 /* Win32 needs the O_BINARY flag for open() */ +#endif /* _WIN32 */ + +/* directory handling */ +#define WS_DIR GDir +#define WS_DIRENT const char +#define ws_dir_open g_dir_open +#define ws_dir_read_name g_dir_read_name +#define ws_dir_get_name(dirent) dirent +#define ws_dir_rewind g_dir_rewind +#define ws_dir_close g_dir_close /* XXX - remove include "dirent.h" */ /* XXX - remove include "direct.h" */ |