diff options
| author | Andreas Schneider <asn@cynapses.org> | 2011-01-01 18:42:13 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cynapses.org> | 2011-01-01 18:43:37 +0100 |
| commit | 1b88542fbe38fc6242ff47a2fde09d1e128bdbca (patch) | |
| tree | b223e2133f5c400bf0ccb66b72c366bec4a44f43 /src/misc.c | |
| parent | 530629c5a74cd1ee359111a56ad4674f4c1ec0c3 (diff) | |
| download | libssh-1b88542fbe38fc6242ff47a2fde09d1e128bdbca.tar.gz libssh-1b88542fbe38fc6242ff47a2fde09d1e128bdbca.tar.xz libssh-1b88542fbe38fc6242ff47a2fde09d1e128bdbca.zip | |
misc: Avoid redefine of _WIN32_IE.
Diffstat (limited to 'src/misc.c')
| -rw-r--r-- | src/misc.c | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -33,15 +33,22 @@ #include <ctype.h> #ifdef _WIN32 -#define _WIN32_IE 0x0501 //SHGetSpecialFolderPath + +#ifndef _WIN32_IE +# define _WIN32_IE 0x0501 // SHGetSpecialFolderPath +#endif + #include <winsock2.h> // Must be the first to include #include <ws2tcpip.h> #include <shlobj.h> #include <direct.h> + #if _MSC_VER >= 1400 -#include <io.h> +# include <io.h> #endif /* _MSC_VER */ + #else /* _WIN32 */ + /* This is needed for a standard getpwuid_r on opensolaris */ #define _POSIX_PTHREAD_SEMANTICS #include <pwd.h> |