From a013d511dda286ec286d84f9dba044c5eb07af2e Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 4 Dec 2002 07:00:13 +0000 Subject: [PATCH] * des.h: Move explicit definition of _WINDOWS to precede conditionalized inclusion of win-mac.h. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15026 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/kerberosIV/ChangeLog | 3 +++ src/include/kerberosIV/des.h | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog index 31a832e21..5deb71aee 100644 --- a/src/include/kerberosIV/ChangeLog +++ b/src/include/kerberosIV/ChangeLog @@ -1,5 +1,8 @@ 2002-12-04 Tom Yu + * des.h: Move explicit definition of _WINDOWS to precede + conditionalized inclusion of win-mac.h. + * kadm.h: Include port-sockets.h, not netinet/in.h, for Windows portability. diff --git a/src/include/kerberosIV/des.h b/src/include/kerberosIV/des.h index d51120958..25826f751 100644 --- a/src/include/kerberosIV/des.h +++ b/src/include/kerberosIV/des.h @@ -110,6 +110,9 @@ KRBINT_END_DECLS #ifndef KRB5INT_CRYPTO_DES_INT #define DES_DEFS +#if defined(_WIN32) && !defined(_WINDOWS) +#define _WINDOWS +#endif #if defined(_WINDOWS) #ifndef KRB4 #define KRB4 1 @@ -128,10 +131,6 @@ KRBINT_BEGIN_DECLS # pragma options align=mac68k #endif -#if defined(_WIN32) && !defined(_WINDOWS) -#define _WINDOWS -#endif - /* Windows declarations */ #ifndef KRB5_CALLCONV #define KRB5_CALLCONV -- 2.26.2