From 517f024834778e4f6010522fe584ae0d2f8fb905 Mon Sep 17 00:00:00 2001
From: John Kohl <jtkohl@mit.edu>
Date: Mon, 26 Mar 1990 17:13:39 +0000
Subject: [PATCH] remove leading __ on #include-blockers (__ is reserved by
 standards)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@422 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/include/krb5/base-defs.h    | 6 +++---
 src/include/krb5/ccache.h       | 6 +++---
 src/include/krb5/crc-32.h       | 6 +++---
 src/include/krb5/errors.h       | 6 +++---
 src/include/krb5/fieldbits.h    | 6 +++---
 src/include/krb5/func-proto.h   | 6 +++---
 src/include/krb5/hostaddr.h     | 6 +++---
 src/include/krb5/kdb.h          | 6 +++---
 src/include/krb5/kdb_dbm.h      | 6 +++---
 src/include/krb5/keytab.h       | 6 +++---
 src/include/krb5/libos.h        | 6 +++---
 src/include/krb5/los-proto.h    | 6 +++---
 src/include/krb5/macros.h       | 6 +++---
 src/include/krb5/mit-des.h      | 6 +++---
 src/include/krb5/proto.h        | 6 +++---
 src/include/krb5/rcache.h       | 6 +++---
 src/include/krb5/stock/config.h | 6 +++---
 src/include/krb5/stock/osconf.h | 6 +++---
 src/include/krb5/wordsize.h     | 6 +++---
 19 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h
index 25c51b932..2f7834321 100644
--- a/src/include/krb5/base-defs.h
+++ b/src/include/krb5/base-defs.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_BASE_DEFS__
-#define __KRB5_BASE_DEFS__
+#ifndef KRB5_BASE_DEFS__
+#define KRB5_BASE_DEFS__
 
 #include <krb5/wordsize.h>
 
@@ -70,4 +70,4 @@ typedef char * krb5_pointer;
 #define OLDDECLARG(type, val) type val;
 #endif /* __STDC__ */
 
-#endif /* __KRB5_BASE_DEFS__ */
+#endif /* KRB5_BASE_DEFS__ */
diff --git a/src/include/krb5/ccache.h b/src/include/krb5/ccache.h
index 50324ad0f..f2e6d8997 100644
--- a/src/include/krb5/ccache.h
+++ b/src/include/krb5/ccache.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_CCACHE__
-#define __KRB5_CCACHE__
+#ifndef KRB5_CCACHE__
+#define KRB5_CCACHE__
 
 typedef	krb5_pointer	krb5_cc_cursor;	/* cursor for sequential lookup */
 
@@ -56,4 +56,4 @@ typedef struct _krb5_cc_ops {
 /* for set_flags and other functions */
 #define KRB5_TC_OPENCLOSE		0x00000001
 
-#endif /* __KRB5_CCACHE__ */
+#endif /* KRB5_CCACHE__ */
diff --git a/src/include/krb5/crc-32.h b/src/include/krb5/crc-32.h
index ac4a487a7..fac0b3566 100644
--- a/src/include/krb5/crc-32.h
+++ b/src/include/krb5/crc-32.h
@@ -13,11 +13,11 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_CRC32__
-#define __KRB5_CRC32__
+#ifndef KRB5_CRC32__
+#define KRB5_CRC32__
 
 #define CRC32_CKSUMTYPE	1
 
 #define CRC32_CKSUM_LENGTH	(4*sizeof(krb5_octet))
 
-#endif /* __KRB5_CRC32__ */
+#endif /* KRB5_CRC32__ */
diff --git a/src/include/krb5/errors.h b/src/include/krb5/errors.h
index 20d424ff1..e2a4ef2d0 100644
--- a/src/include/krb5/errors.h
+++ b/src/include/krb5/errors.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_ERRORS__
-#define __KRB5_ERRORS__
+#ifndef KRB5_ERRORS__
+#define KRB5_ERRORS__
 
 
 /* Error codes used in KRB_ERROR protocol messages.
@@ -58,4 +58,4 @@
 /* other errors */
 #define	KRB_ERR_FIELD_TOOLONG	50	/* Field is too long for impl. */
 
-#endif /* __KRB5_ERRORS__ */
+#endif /* KRB5_ERRORS__ */
diff --git a/src/include/krb5/fieldbits.h b/src/include/krb5/fieldbits.h
index e22683b85..c0e2882be 100644
--- a/src/include/krb5/fieldbits.h
+++ b/src/include/krb5/fieldbits.h
@@ -14,8 +14,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_FIELDBITS__
-#define __KRB5_FIELDBITS__
+#ifndef KRB5_FIELDBITS__
+#define KRB5_FIELDBITS__
 
 /* kdc_options for kdc_request */
 /* options is 32 bits; each host is responsible to put the 4 bytes
@@ -151,6 +151,6 @@
 #define	MSEC_DIRBIT		0x8000
 #define	MSEC_VAL_MASK		0x7fff
 
-#endif /* __KRB5_FIELDBITS__ */
+#endif /* KRB5_FIELDBITS__ */
 
 
diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index 379e71ea3..85398ce18 100644
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_FUNC_PROTO__
-#define __KRB5_FUNC_PROTO__
+#ifndef KRB5_FUNC_PROTO__
+#define KRB5_FUNC_PROTO__
 
 
 /* libkrb.spec */
@@ -374,4 +374,4 @@ void krb5_free_priv_enc_part
 	PROTOTYPE((krb5_priv_enc_part * ));
 
 
-#endif /* __KRB5_FUNC_PROTO__ */
+#endif /* KRB5_FUNC_PROTO__ */
diff --git a/src/include/krb5/hostaddr.h b/src/include/krb5/hostaddr.h
index 4148c7961..efe8dc727 100644
--- a/src/include/krb5/hostaddr.h
+++ b/src/include/krb5/hostaddr.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_HOSTADDR__
-#define __KRB5_HOSTADDR__
+#ifndef KRB5_HOSTADDR__
+#define KRB5_HOSTADDR__
 
 /* structure for address */
 typedef struct _krb5_address {
@@ -40,6 +40,6 @@ typedef struct _krb5_fulladdr {
 					   large enough for most protos? */
 } krb5_fulladdr;
 
-#endif /* __KRB5_HOSTADDR__ */
+#endif /* KRB5_HOSTADDR__ */
 
 
diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index dcd6b6eb8..1c11c4403 100644
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_KDB5__
-#define __KRB5_KDB5__
+#ifndef KRB5_KDB5__
+#define KRB5_KDB5__
 
 typedef struct _krb5_db_entry {
     krb5_principal principal;
@@ -100,4 +100,4 @@ krb5_error_code krb5_kdb_decrypt_key
 /* XXX THIS REALLY BELONGS ELSEWHERE */
 #define	TGTNAME	"krbtgt"
 
-#endif /* __KRB5_KDB5__ */
+#endif /* KRB5_KDB5__ */
diff --git a/src/include/krb5/kdb_dbm.h b/src/include/krb5/kdb_dbm.h
index f8d5ffb93..8e6082dee 100644
--- a/src/include/krb5/kdb_dbm.h
+++ b/src/include/krb5/kdb_dbm.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_KDB5_DBM__
-#define __KRB5_KDB5_DBM__
+#ifndef KRB5_KDB5_DBM__
+#define KRB5_KDB5_DBM__
 
 #define	DEFAULT_DBM_FILE		"/krb5/principal"
 
@@ -52,4 +52,4 @@ krb5_error_code krb5_dbm_db_iterate
     PROTOTYPE((krb5_error_code (*) PROTOTYPE((krb5_pointer,
 					      krb5_db_entry *)),
 	       krb5_pointer ));
-#endif /* __KRB5_KDB5_DBM__ */
+#endif /* KRB5_KDB5_DBM__ */
diff --git a/src/include/krb5/keytab.h b/src/include/krb5/keytab.h
index 79cfcdb25..5d145ad49 100644
--- a/src/include/krb5/keytab.h
+++ b/src/include/krb5/keytab.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_KEYTAB__
-#define __KRB5_KEYTAB__
+#ifndef KRB5_KEYTAB__
+#define KRB5_KEYTAB__
 
 
 /* XXX */
@@ -62,4 +62,4 @@ typedef struct _krb5_kt_ops {
 				  krb5_kt_cursor));
 } krb5_kt_ops;
 
-#endif /* __KRB5_KEYTAB__ */
+#endif /* KRB5_KEYTAB__ */
diff --git a/src/include/krb5/libos.h b/src/include/krb5/libos.h
index 1ac929d66..91a346d0f 100644
--- a/src/include/krb5/libos.h
+++ b/src/include/krb5/libos.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_LIBOS__
-#define __KRB5_LIBOS__
+#ifndef KRB5_LIBOS__
+#define KRB5_LIBOS__
 
 /* lock mode flags */
 #define	KRB5_LOCKMODE_SHARED	0x0001
@@ -22,4 +22,4 @@
 #define	KRB5_LOCKMODE_DONTBLOCK	0x0004
 #define	KRB5_LOCKMODE_UNLOCK	0x0008
 
-#endif /* __KRB5_LIBOS__ */
+#endif /* KRB5_LIBOS__ */
diff --git a/src/include/krb5/los-proto.h b/src/include/krb5/los-proto.h
index 1ab2a9595..0f82d4ba2 100644
--- a/src/include/krb5/los-proto.h
+++ b/src/include/krb5/los-proto.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_LIBOS_PROTO__
-#define __KRB5_LIBOS_PROTO__
+#ifndef KRB5_LIBOS_PROTO__
+#define KRB5_LIBOS_PROTO__
 
 /* requires <stdio.h> */
 
@@ -49,4 +49,4 @@ krb5_error_code krb5_os_localaddr
 	PROTOTYPE((krb5_address ***));
 
 
-#endif /* __KRB5_LIBOS_PROTO__ */
+#endif /* KRB5_LIBOS_PROTO__ */
diff --git a/src/include/krb5/macros.h b/src/include/krb5/macros.h
index 3f50759ac..e386760a1 100644
--- a/src/include/krb5/macros.h
+++ b/src/include/krb5/macros.h
@@ -13,7 +13,7 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_MACROS__
-#define __KRB5_MACROS__
+#ifndef KRB5_MACROS__
+#define KRB5_MACROS__
 
-#endif /* __KRB5_MACROS__ */
+#endif /* KRB5_MACROS__ */
diff --git a/src/include/krb5/mit-des.h b/src/include/krb5/mit-des.h
index 5fb70df50..59615f878 100644
--- a/src/include/krb5/mit-des.h
+++ b/src/include/krb5/mit-des.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_MIT_DES__
-#define __KRB5_MIT_DES__
+#ifndef KRB5_MIT_DES__
+#define KRB5_MIT_DES__
 
 typedef krb5_krb5_octet des_cblock[8];	/* crypto-block size */
 
@@ -36,4 +36,4 @@ typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16];
 /* cryptosystem entry descriptor for MIT's DES encryption library */
 extern krb5_cryptosystem_entry  mit_des_cryptosystem_entry;
 
-#endif /* __KRB5_MIT_DES__ */
+#endif /* KRB5_MIT_DES__ */
diff --git a/src/include/krb5/proto.h b/src/include/krb5/proto.h
index dcc907e11..d13214cdb 100644
--- a/src/include/krb5/proto.h
+++ b/src/include/krb5/proto.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_PROTO__
-#define __KRB5_PROTO__
+#ifndef	KRB5_PROTO__
+#define KRB5_PROTO__
 
 /* Protocol version number */
 #define	KRB5_PVNO	5
@@ -31,4 +31,4 @@
 #define	KRB5_TGS_REP	((krb5_msgtype)16) /* Response to KRB_TGS_REQ req */
 #define	KRB5_ERROR	((krb5_msgtype)32) /* Error response */
 
-#endif /* __KRB5_PROTO__ */
+#endif /* KRB5_PROTO__ */
diff --git a/src/include/krb5/rcache.h b/src/include/krb5/rcache.h
index 7963a9204..168fe434f 100644
--- a/src/include/krb5/rcache.h
+++ b/src/include/krb5/rcache.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_RCACHE__
-#define __KRB5_RCACHE__
+#ifndef KRB5_RCACHE__
+#define KRB5_RCACHE__
 
 typedef struct krb5_rc_st {
 	struct krb5_rc_ops *ops;
@@ -41,4 +41,4 @@ typedef struct _krb5_rc_ops {
 } krb5_rc_ops;
 
 
-#endif /* __KRB5_RCACHE__ */
+#endif /* KRB5_RCACHE__ */
diff --git a/src/include/krb5/stock/config.h b/src/include/krb5/stock/config.h
index f868394bb..9f83901d3 100644
--- a/src/include/krb5/stock/config.h
+++ b/src/include/krb5/stock/config.h
@@ -14,8 +14,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_CONFIG__
-#define __KRB5_CONFIG__
+#ifndef KRB5_CONFIG__
+#define KRB5_CONFIG__
 
 #if defined(vax) || defined(__vax__)
 #define BITS32
@@ -29,4 +29,4 @@
 #define BITS32
 #endif
 
-#endif /* __KRB5_CONFIG__ */
+#endif /* KRB5_CONFIG__ */
diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h
index b3d433ee8..b8fa543c9 100644
--- a/src/include/krb5/stock/osconf.h
+++ b/src/include/krb5/stock/osconf.h
@@ -14,8 +14,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __krb5_osconf__
-#define __krb5_osconf__
+#ifndef KRB5_OSCONF__
+#define KRB5_OSCONF__
 
 #define KRB5_USE_INET		/* Support IP address family */
 
@@ -26,4 +26,4 @@
 typedef int sigtype;
 #endif
 
-#endif /* __krb5_osconf__ */
+#endif /* KRB5_OSCONF__ */
diff --git a/src/include/krb5/wordsize.h b/src/include/krb5/wordsize.h
index 8feed4e65..f7ae21a6e 100644
--- a/src/include/krb5/wordsize.h
+++ b/src/include/krb5/wordsize.h
@@ -13,8 +13,8 @@
 
 #include <krb5/copyright.h>
 
-#ifndef __KRB5_WORDSIZE__
-#define __KRB5_WORDSIZE__
+#ifndef KRB5_WORDSIZE__
+#define KRB5_WORDSIZE__
 
 #ifdef BITS16
 #define __OK
@@ -41,4 +41,4 @@ typedef	unsigned char	krb5_octet;
    indicator */
 #define KRB5_INT32_MIN	(-KRB5_INT32_MAX-1)
 
-#endif /* __KRB5_WORDSIZE__ */
+#endif /* KRB5_WORDSIZE__ */
-- 
2.26.2