diff options
Diffstat (limited to 'jnlib')
| -rw-r--r-- | jnlib/ChangeLog | 4 | ||||
| -rw-r--r-- | jnlib/mischelp.h | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog index b9984235c..5f00f8ebc 100644 --- a/jnlib/ChangeLog +++ b/jnlib/ChangeLog @@ -1,3 +1,7 @@ +2009-06-04 Werner Koch <[email protected]> + + * mischelp.h: Include SUN_LEN etc also for W32. + 2009-05-19 Werner Koch <[email protected]> * mischelp.h: Define PF_LOCAL, AF_LOCAL and SUN_LEN if requested. diff --git a/jnlib/mischelp.h b/jnlib/mischelp.h index 6bf7a9174..e478354d1 100644 --- a/jnlib/mischelp.h +++ b/jnlib/mischelp.h @@ -61,9 +61,13 @@ time_t timegm (struct tm *tm); /* Include hacks which are mainly required for Slowaris. */ -#if defined(JNLIB_NEED_AFLOCAL) && !defined(HAVE_W32_SYSTEM) -#include <sys/socket.h> -#include <sys/un.h> +#ifdef JNLIB_NEED_AFLOCAL +#ifndef HAVE_W32_SYSTEM +# include <sys/socket.h> +# include <sys/un.h> +#else +# include <windows.h> +#endif #ifndef PF_LOCAL # ifdef PF_UNIX @@ -88,7 +92,7 @@ time_t timegm (struct tm *tm); # define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \ + strlen ((ptr)->sun_path)) #endif /*SUN_LEN*/ -#endif /*JNLIB_NEED_AFLOCAL && !HAVE_W32_SYSTEM*/ +#endif /*JNLIB_NEED_AFLOCAL*/ #endif /*LIBJNLIB_MISCHELP_H*/ |