diff options
Diffstat (limited to 'jnlib')
| -rw-r--r-- | jnlib/ChangeLog | 4 | ||||
| -rw-r--r-- | jnlib/logging.c | 4 | ||||
| -rw-r--r-- | jnlib/types.h | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog index 4c52590f5..5ca33d5fb 100644 --- a/jnlib/ChangeLog +++ b/jnlib/ChangeLog @@ -1,3 +1,7 @@ +2004-11-26 Werner Koch <[email protected]> + + * logging.c [_WIN32]: Don't include socket headers. + 2004-11-30 Timo Schulz <[email protected]> * w32-afunix.c: New. AF_UNIX emulation for W32. diff --git a/jnlib/logging.c b/jnlib/logging.c index 5397a1184..960d816eb 100644 --- a/jnlib/logging.c +++ b/jnlib/logging.c @@ -34,9 +34,11 @@ #include <errno.h> #include <time.h> #include <sys/types.h> -#include <sys/socket.h> #include <sys/stat.h> +#ifndef _WIN32 +#include <sys/socket.h> #include <sys/un.h> +#endif #include <unistd.h> #include <fcntl.h> #include <assert.h> diff --git a/jnlib/types.h b/jnlib/types.h index 230d1502f..934b7a6ee 100644 --- a/jnlib/types.h +++ b/jnlib/types.h @@ -42,7 +42,11 @@ #ifndef HAVE_BYTE_TYPEDEF #undef byte /* maybe there is a macro with this name */ +/* Windows typedefs byte in the rpc headers. Avoid warning about + double definition. */ +#if !(defined(_WIN32) && defined(cbNDRContext)) typedef unsigned char byte; +#endif #define HAVE_BYTE_TYPEDEF #endif |