From dc8e7f2fdf754db9778214475607f536c6953357 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Tue, 28 Aug 2007 00:28:17 +0000 Subject: [PATCH] Remove macros and associated comments that appear to be for multiple-inclusion protection of only sub-portions of k5-int.h, presumably from a time when those portions were separate files. Since the entire file is now protected against multiple inclusions, these other macros aren't needed. A few are left, mostly because they also appear in other files. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19889 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/k5-int.h | 65 -------------------------------------------- 1 file changed, 65 deletions(-) diff --git a/src/include/k5-int.h b/src/include/k5-int.h index ee421d2de..a96c265ce 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -104,10 +104,7 @@ #define ANSI_STDIO #endif -#ifndef KRB5_AUTOCONF__ -#define KRB5_AUTOCONF__ #include "autoconf.h" -#endif #ifndef KRB5_SYSTYPES__ #define KRB5_SYSTYPES__ @@ -172,16 +169,6 @@ typedef INT64_TYPE krb5_int64; /* Get error info support. */ #include "k5-err.h" -/* krb5/krb5.h includes many other .h files in the krb5 subdirectory. - The ones that it doesn't include, we include below. */ - -/* - * Begin "k5-errors.h" - */ -#ifndef KRB5_ERRORS__ -#define KRB5_ERRORS__ - - /* Error codes used in KRB_ERROR protocol messages. Return values of library routines are based on a different error table (which allows non-ambiguous error codes between subsystems) */ @@ -269,11 +256,6 @@ typedef INT64_TYPE krb5_int64; #define KDC_ERR_DIGEST_IN_SIGNED_DATA_NOT_ACCEPTED 80 /* bad digest algorithm in SignedData */ #define KDC_ERR_PUBLIC_KEY_ENCRYPTION_NOT_SUPPORTED 81 -#endif /* KRB5_ERRORS__ */ -/* - * End "k5-errors.h" - */ - /* * This structure is returned in the e-data field of the KRB-ERROR * message when the error calling for an alternative form of @@ -440,12 +422,6 @@ typedef struct _krb5_enc_sam_response_enc_2 { #include "k5-int-pkinit.h" -/* - * Begin "ext-proto.h" - */ -#ifndef KRB5_EXT_PROTO__ -#define KRB5_EXT_PROTO__ - #include #include @@ -457,23 +433,6 @@ extern char *strdup (const char *); #include #endif -#endif /* KRB5_EXT_PROTO__ */ -/* - * End "ext-proto.h" - */ - -/* - * Begin "sysincl.h" - */ -#ifndef KRB5_SYSINCL__ -#define KRB5_SYSINCL__ - -#ifndef KRB5_SYSTYPES__ -#define KRB5_SYSTYPES__ -/* needed for much of the rest -- but already handled in krb5.h? */ -/* #include */ -#endif /* KRB5_SYSTYPES__ */ - #ifdef HAVE_SYS_TIME_H #include #ifdef TIME_WITH_SYS_TIME @@ -501,17 +460,6 @@ extern char *strdup (const char *); #include #endif -#endif /* KRB5_SYSINCL__ */ -/* - * End "sysincl.h" - */ - -/* - * Begin "los-proto.h" - */ -#ifndef KRB5_LIBOS_PROTO__ -#define KRB5_LIBOS_PROTO__ - #include struct addrlist; @@ -578,8 +526,6 @@ krb5int_locate_server (krb5_context, const krb5_data *realm, struct addrlist *, enum locate_service_type svc, int sockettype, int family); -#endif /* KRB5_LIBOS_PROTO__ */ - /* new encryption provider api */ struct krb5_enc_provider { @@ -795,12 +741,6 @@ krb5_error_code krb5_encrypt_helper * End "los-proto.h" */ -/* - * Begin "libos.h" - */ -#ifndef KRB5_LIBOS__ -#define KRB5_LIBOS__ - typedef struct _krb5_os_context { krb5_magic magic; krb5_int32 time_offset; @@ -832,11 +772,6 @@ typedef struct _krb5_os_context { #define KRB5_LOCKMODE_DONTBLOCK 0x0004 #define KRB5_LOCKMODE_UNLOCK 0x0008 -#endif /* KRB5_LIBOS__ */ -/* - * End "libos.h" - */ - /* * Define our view of the size of a DES key. */ -- 2.26.2