diff options
| author |  Nikias Bassen | 2013-02-15 22:01:44 +0100 |
|---|---|---|
| committer | Nikias Bassen | 2013-02-15 22:01:44 +0100 |
| commit | 630203f8700d8dcf9be661695418dbbddbe42df4 (patch) | |
| tree | 2f66a3219f8002715d0e3f68f631d9029b27f62a /util/include | |
| parent | 598c36b5c4fa71821c04584f093295180aaa5086 (diff) | |
| download | axis2c-630203f8700d8dcf9be661695418dbbddbe42df4.tar.gz axis2c-630203f8700d8dcf9be661695418dbbddbe42df4.tar.bz2 | |
util: fixed building on mingw32
Diffstat (limited to 'util/include')
| -rw-r--r-- | util/include/axutil_log.h | 2 | ||||
| -rw-r--r-- | util/include/axutil_utils_defines.h | 8 | ||||
| -rw-r--r-- | util/include/platforms/windows/axutil_dir_windows.h | 3 | ||||
| -rw-r--r-- | util/include/platforms/windows/axutil_windows.h | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/util/include/axutil_log.h b/util/include/axutil_log.h index 09e9242..453b04a 100644 --- a/util/include/axutil_log.h +++ b/util/include/axutil_log.h @@ -227,7 +227,7 @@ extern "C" # define AXIS2_LOG_TRACE(params, ...) # elif __STDC__ && __STDC_VERSION > 199901L # define AXIS2_LOG_TRACE(params, ...) -# elif WIN32 +# elif defined(WIN32) # define AXIS2_LOG_TRACE axutil_log_impl_log_trace # else # define AXIS2_LOG_TRACE axutil_log_impl_log_trace diff --git a/util/include/axutil_utils_defines.h b/util/include/axutil_utils_defines.h index 003cbae..2f5d374 100644 --- a/util/include/axutil_utils_defines.h +++ b/util/include/axutil_utils_defines.h @@ -21,7 +21,7 @@ #include <stddef.h> -#if !defined(_WIN32) +#if !defined(_WIN32) || defined(__MINGW32__) #include <stdint.h> #endif @@ -30,7 +30,7 @@ extern "C" { #endif -#if defined(_WIN32) && !defined(AXIS2_SKIP_INT_TYPEDEFS) +#if defined(_WIN32) && !defined(__MINGW32__) && !defined(AXIS2_SKIP_INT_TYPEDEFS) /** * ANSI Type definitions for Windows */ @@ -107,7 +107,7 @@ extern "C" /** * Exporting */ -#if defined(_WIN32) && !defined(AXIS2_DECLARE_STATIC) +#if defined(_WIN32) && !defined(__MINGW32__) && !defined(AXIS2_DECLARE_STATIC) #define AXIS2_EXPORT __declspec(dllexport) #else #define AXIS2_EXPORT @@ -116,7 +116,7 @@ extern "C" /** * Importing */ -#if defined(_WIN32) +#if defined(_WIN32) && !defined(__MINGW32__) #define AXIS2_IMPORT __declspec(dllimport) #else #define AXIS2_IMPORT diff --git a/util/include/platforms/windows/axutil_dir_windows.h b/util/include/platforms/windows/axutil_dir_windows.h index 89ba297..ce92a2f 100644 --- a/util/include/platforms/windows/axutil_dir_windows.h +++ b/util/include/platforms/windows/axutil_dir_windows.h @@ -26,6 +26,9 @@ #include <windows.h> #include <axutil_utils_defines.h> +#ifndef _MAX_FNAME +#define _MAX_FNAME MAX_PATH +#endif /* struct dirent - same as Unix dirent.h */ struct dirent diff --git a/util/include/platforms/windows/axutil_windows.h b/util/include/platforms/windows/axutil_windows.h index 53d332c..843c3bf 100644 --- a/util/include/platforms/windows/axutil_windows.h +++ b/util/include/platforms/windows/axutil_windows.h @@ -217,7 +217,7 @@ extern "C" #define AXIS2_W_OK 02 /* test for write permission */ #define AXIS2_X_OK 00 /* test for execute or search permission */ #define AXIS2_F_OK 00 /* test whether the directories leading to the file can be - searched and the file exists * / + searched and the file exists */ /** * windows specific directory handling functions |