diff options
| author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2006-02-27 19:22:08 +0000 |
|---|---|---|
| committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2006-02-27 19:22:08 +0000 |
| commit | c53f7fd2ca7d605397091294683eaf63d6b922f2 (patch) | |
| tree | fab7fe52977a865d764581becde0e1e052742667 /src/include/win-mac.h | |
| parent | 3859c1100296dfba406107fcdf23fc30da385181 (diff) | |
| download | krb5-c53f7fd2ca7d605397091294683eaf63d6b922f2.tar.gz krb5-c53f7fd2ca7d605397091294683eaf63d6b922f2.tar.xz krb5-c53f7fd2ca7d605397091294683eaf63d6b922f2.zip | |
Qing Dong <dongq@mit.edu> provided a set of changes to allow
krb5 to build under the Microsoft Visual Studio 8 compiler
in 64-bit mode and produce file names that do not conflict
with the names produced by the 32-bit build. That patch
was modified to work on Unix and also include processor
dependent pre-processor definitions to remove warnings.
ticket: 3415
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17680 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/win-mac.h')
| -rw-r--r-- | src/include/win-mac.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/include/win-mac.h b/src/include/win-mac.h index ea53cf17fa..4249f0db55 100644 --- a/src/include/win-mac.h +++ b/src/include/win-mac.h @@ -25,21 +25,6 @@ #else /* ! RES_ONLY */ -#define SIZEOF_INT 4 -#define SIZEOF_SHORT 2 -#define SIZEOF_LONG 4 - -#include <windows.h> -#include <limits.h> - -#ifndef SIZE_MAX /* in case Microsoft defines max size of size_t */ -#ifdef MAX_SIZE /* Microsoft defines MAX_SIZE as max size of size_t */ -#define SIZE_MAX MAX_SIZE -#else -#define SIZE_MAX UINT_MAX -#endif -#endif - /* To ensure backward compatibility of the ABI use 32-bit time_t on * 32-bit Windows. */ @@ -55,6 +40,21 @@ #endif #endif +#define SIZEOF_INT 4 +#define SIZEOF_SHORT 2 +#define SIZEOF_LONG 4 + +#include <windows.h> +#include <limits.h> + +#ifndef SIZE_MAX /* in case Microsoft defines max size of size_t */ +#ifdef MAX_SIZE /* Microsoft defines MAX_SIZE as max size of size_t */ +#define SIZE_MAX MAX_SIZE +#else +#define SIZE_MAX UINT_MAX +#endif +#endif + #ifndef KRB5_CALLCONV # define KRB5_CALLCONV __stdcall # define KRB5_CALLCONV_C __cdecl |