diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2001-10-06 03:14:42 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2001-10-06 03:14:42 +0000 |
| commit | c1d2e4e4deaa5d5df19171539a30c13fc43b7a6f (patch) | |
| tree | b6b4e2f17a5ab2b237a27c2f6c80f659615285bd /src/include/win-mac.h | |
| parent | 2e0ebe3766332b985c79b7ff92476c61fa16326b (diff) | |
| download | krb5-c1d2e4e4deaa5d5df19171539a30c13fc43b7a6f.tar.gz krb5-c1d2e4e4deaa5d5df19171539a30c13fc43b7a6f.tar.xz krb5-c1d2e4e4deaa5d5df19171539a30c13fc43b7a6f.zip | |
Danilo also says we can get rid of _MSDOS (Win16) tests, and explicit FAR/NEAR specs
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13786 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/win-mac.h')
| -rw-r--r-- | src/include/win-mac.h | 55 |
1 files changed, 4 insertions, 51 deletions
diff --git a/src/include/win-mac.h b/src/include/win-mac.h index d92a11a3f9..60039d8f71 100644 --- a/src/include/win-mac.h +++ b/src/include/win-mac.h @@ -7,10 +7,11 @@ #ifndef _KRB5_WIN_MAC_H #define _KRB5_WIN_MAC_H -#if (defined(_MSDOS) || defined(_WIN32)) +#if defined(_WIN32) /* * Machine-type definitions: PC Clone 386 running Microloss Windows */ +/* Windows 32 specific */ #define ID_READ_PWD_DIALOG 10000 #define ID_READ_PWD_PROMPT 10001 @@ -24,45 +25,11 @@ #else -#if defined(_MSDOS) - /* Windows 16 specific */ -#define BITS16 -#define SIZEOF_INT 2 -#define SIZEOF_SHORT 2 -#define SIZEOF_LONG 4 - -#ifndef KRB5_CALLCONV -#define KRB5_CALLCONV __far __export __pascal -#define KRB5_CALLCONV_C __far __export __cdecl -#define KRB5_EXPORTVAR __far __export -#endif /* !KRB5_CALLCONV */ - -#include <windows.h> - -/* - * The following defines are needed to make <windows.h> work - * in stdc mode (/Za flag). Winsock.h needs <windows.h>. - */ -#ifndef FAR -#define FAR __far -#define NEAR __near -#endif - -#ifndef _far -#define _far __far -#define _near __near -#define _pascal __pascal -#define _cdecl __cdecl -#define _huge __huge -#endif - -#else - /* Windows 32 specific */ #define SIZEOF_INT 4 #define SIZEOF_SHORT 2 #define SIZEOF_LONG 4 -#include <windows.h> /* always include this here, to get correct FAR and NEAR */ +#include <windows.h> #define HAVE_LABS @@ -72,8 +39,6 @@ # define KRB5_EXPORTVAR #endif /* !KRB5_CALLCONV */ -#endif /* _MSDOS */ - #ifndef KRB5_SYSTYPES__ #define KRB5_SYSTYPES__ #include <sys/types.h> @@ -204,7 +169,7 @@ HINSTANCE get_lib_instance(void); #endif /* !RES_ONLY */ -#endif /* _MSDOS || _WIN32 */ +#endif /* _WIN32 */ #ifdef macintosh @@ -212,12 +177,6 @@ HINSTANCE get_lib_instance(void); #define KRB5_CALLCONV #define KRB5_CALLCONV_C -#ifndef FAR -#define FAR -#endif -#ifndef NEAR -#define NEAR -#endif #define SIZEOF_INT 4 #define SIZEOF_SHORT 2 @@ -285,11 +244,5 @@ int fstat(int fildes, struct stat *buf); #define KRB5_CALLCONV #define KRB5_CALLCONV_C #endif -#ifndef FAR -#define FAR -#endif -#ifndef NEAR -#define NEAR -#endif #endif /* _KRB5_WIN_MAC_H */ |