diff options
| author | Andreas Schneider <asn@cynapses.org> | 2010-07-13 15:10:19 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cynapses.org> | 2010-07-13 15:10:19 +0200 |
| commit | 7029d2f4b8af5a9cf067a17d17f3805c5a2f537a (patch) | |
| tree | b839b8bd9825942c1f469c4fddff6f93f4229ee8 /include | |
| parent | 3c9c358385fbb0d49609c99439ea481aa7f5e4cc (diff) | |
build: Fixed the Windows preprocessor macros and defines.
Diffstat (limited to 'include')
| -rw-r--r-- | include/libssh/priv.h | 51 |
1 files changed, 2 insertions, 49 deletions
diff --git a/include/libssh/priv.h b/include/libssh/priv.h index f3c2babd..1672fb48 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -32,57 +32,10 @@ #include "config.h" -#ifdef _MSC_VER - -/** Imitate define of inttypes.h */ -#define PRIdS "Id" - -#define strcasecmp _stricmp -#define strncasecmp _strnicmp -#define strtoull _strtoui64 -#define isblank(ch) ((ch) == ' ' || (ch) == '\t' || (ch) == '\n' || (ch) == '\r') - -#if _MSC_VER >= 1400 -#define strdup _strdup -#endif -#define usleep(X) Sleep(((X)+1000)/1000) - -#undef strtok_r -#define strtok_r strtok_s - -#ifndef HAVE_SNPRINTF -#ifdef HAVE__SNPRINTF_S -#define snprintf(d, n, ...) _snprintf_s((d), (n), _TRUNCATE, __VA_ARGS__) -#else -#ifdef HAVE__SNPRINTF -#define snprintf _snprintf -#else -#error "no snprintf compatible function found" -#endif /* HAVE__SNPRINTF */ -#endif /* HAVE__SNPRINTF_S */ -#endif /* HAVE_SNPRINTF */ - -#ifndef HAVE_VSNPRINTF -#ifdef HAVE__VSNPRINTF_S -#define vsnprintf(s, n, f, v) _vsnprintf_s((s), (n), _TRUNCATE, (f), (v)) -#else -#ifdef HAVE__VSNPRINTF -#define vsnprintf _vsnprintf -#else /* HAVE_VSNPRINTF */ -#error "No vsnprintf compatible function found" -#endif /* HAVE__VSNPRINTF */ -#endif /* HAVE__VSNPRINTF_S */ -#endif /* HAVE_VSNPRINTF */ - -#ifndef HAVE_STRNCPY -#define strncpy(d, s, n) strncpy_s((d), (n), (s), _TRUNCATE) -#endif -#else /* _MSC_VER */ - +#ifndef _WIN32 #include <unistd.h> #define PRIdS "zd" - -#endif /* _MSC_VER */ +#endif /* _WIN32 */ #include "libssh/libssh.h" #include "libssh/callbacks.h" |