diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2011-12-01 23:47:41 +0000 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2011-12-01 23:47:41 +0000 |
| commit | 1eaceca55c7e62892fd28bfbb5fc03240a48cee3 (patch) | |
| tree | 7243fcd09c57e06e72b15f0044fd2c77babd7843 /lib/wincompat.h | |
| parent | d4b5ddf4bcacd692011f5a597025c38a1262d6ca (diff) | |
| parent | 429e46051dba814e7d6c74368eb1bba550222cbe (diff) | |
| download | libconfig-1eaceca55c7e62892fd28bfbb5fc03240a48cee3.tar.gz | |
Merge commit 'upstream/1.4.8'
Conflicts:
debian/changelog
debian/control
debian/libconfig++9-dev.install
debian/libconfig8.install
debian/libconfig9-dev.install
debian/rules
Diffstat (limited to '')
| -rw-r--r-- | lib/wincompat.h (renamed from wincompat.h) | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/wincompat.h b/lib/wincompat.h index 6526c1f..23d7379 100644 --- a/wincompat.h +++ b/lib/wincompat.h @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- libconfig - A library for processing structured configuration files - Copyright (C) 2005-2009 Mark A Lindner + Copyright (C) 2005-2010 Mark A Lindner This file is part of libconfig. @@ -32,34 +32,39 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> -#define atoll _atoi64 #define snprintf _snprintf #ifndef __MINGW32__ +#define atoll _atoi64 #define strtoull _strtoui64 -#endif // __MINGW32__ +#endif /* __MINGW32__ */ #endif #if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) \ || defined(__MINGW32__)) -// Why does gcc on MinGW use the Visual C++ style format directives -// for 64-bit integers? Inquiring minds want to know.... +/* Why does gcc on MinGW use the Visual C++ style format directives + * for 64-bit integers? Inquiring minds want to know.... + */ #define INT64_FMT "%I64d" #define UINT64_FMT "%I64u" #define INT64_HEX_FMT "%I64X" -#else // defined(WIN32) || defined(__MINGW32__) +#define FILE_SEPARATOR "\\" + +#else /* defined(WIN32) || defined(__MINGW32__) */ #define INT64_FMT "%lld" #define UINT64_FMT "%llu" #define INT64_HEX_FMT "%llX" -#endif // defined(WIN32) || defined(__MINGW32__) +#define FILE_SEPARATOR "/" + +#endif /* defined(WIN32) || defined(__MINGW32__) */ #if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) \ && ! defined(__MINGW32__) @@ -75,11 +80,11 @@ #define INT32_MIN (-2147483647-1) #endif -#else // defined(WIN32) && ! defined(__MINGW32__) +#else /* defined(WIN32) && ! defined(__MINGW32__) */ #define INT64_CONST(I) (I ## LL) #define UINT64_CONST(I) (I ## ULL) -#endif // defined(WIN32) && ! defined(__MINGW32__) +#endif /* defined(WIN32) && ! defined(__MINGW32__) */ -#endif // __wincompat_h +#endif /* __wincompat_h */ |