diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-12-04 07:00:13 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-12-04 07:00:13 +0000 |
| commit | a013d511dda286ec286d84f9dba044c5eb07af2e (patch) | |
| tree | 231229a310bf6afa1f39cd026b44c97609c144d6 /src/include | |
| parent | ad9afb2b58cb76f2ea747e0afb7989a3f95fe712 (diff) | |
| download | krb5-a013d511dda286ec286d84f9dba044c5eb07af2e.tar.gz krb5-a013d511dda286ec286d84f9dba044c5eb07af2e.tar.xz krb5-a013d511dda286ec286d84f9dba044c5eb07af2e.zip | |
* 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
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/kerberosIV/ChangeLog | 3 | ||||
| -rw-r--r-- | 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 31a832e215..5deb71aeec 100644 --- a/src/include/kerberosIV/ChangeLog +++ b/src/include/kerberosIV/ChangeLog @@ -1,5 +1,8 @@ 2002-12-04 Tom Yu <tlyu@mit.edu> + * 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 d51120958e..25826f751b 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 |