fix include for copyright, as well as #ifndef token names

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@33 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h
index 1556452c001f248b7da35535a83577777331bbaa..d9a2cad12e25d96fae8838f4191abadda2555d42 100644 (file)
--- a/src/include/krb5/base-defs.h
+++ b/src/include/krb5/base-defs.h
@@ -11,10 +11,10 @@
  * <<< Description >>>
  */
 
-#include <krb5/mit-copyright.h>
+#include <krb5/copyright.h>
 
-#ifndef __KRB5_TYPEDEFS__
-#define __KRB5_TYPEDEFS__
+#ifndef __KRB5_BASE_DEFS__
+#define __KRB5_BASE_DEFS__
 
 #include <krb5/wordsize.h>
 
@@ -33,4 +33,4 @@ typedef krb5_ui_2     krb5_keytype;
 typedef krb5_ui_2      krb5_enctype;
 typedef krb5_ui_2      krb5_cksumtype;
 
-#endif /* __KRB5_TYPEDEFS__ */
+#endif /* __KRB5_BASE_DEFS__ */

diff --git a/src/include/krb5/hostaddr.h b/src/include/krb5/hostaddr.h
index 4ea4cce325205859e9ae859709ca44aa6afbd0a7..9a1371ec26cf3bf45f777bc3748b2645dfa949ca 100644 (file)
--- a/src/include/krb5/hostaddr.h
+++ b/src/include/krb5/hostaddr.h
@@ -11,10 +11,10 @@
  * hostaddr definitions for Kerberos version 5.
  */
 
-#include <krb5/mit-copyright.h>
+#include <krb5/copyright.h>
 
-#ifndef __KRB_HOSTADDR__
-#define __KRB_HOSTADDR__
+#ifndef __KRB5_HOSTADDR__
+#define __KRB5_HOSTADDR__
 
 /* structure for address */
 typedef struct _krb5_address {
@@ -34,5 +34,5 @@ typedef struct _krb5_address {
 /* macros to determine if a type is a local type */
 #define ADDRTYPE_IS_LOCAL(addrtype) (addrtype & 0x8000)
 
-#endif /* __KRB_HOSTADDR__ */
+#endif /* __KRB5_HOSTADDR__ */
 

diff --git a/src/include/krb5/krb5.h b/src/include/krb5/krb5.h
index aacf802aaf63bd9bdbdb005dad9e2b73eb85482e..54feb713714ff5d4d5ee93601d4866c0537b464e 100644 (file)
--- a/src/include/krb5/krb5.h
+++ b/src/include/krb5/krb5.h
@@ -11,14 +11,16 @@
  * General definitions for Kerberos version 5.
  */
 
-#include <krb5/mit-copyright.h>
+#include <krb5/copyright.h>
 
-#ifndef __KRB_GENERAL__
-#define __KRB_GENERAL__
+#ifndef __KRB5_GENERAL__
+#define __KRB5_GENERAL__
+
+#include <sys/types.h>
 
 #include <krb5/base-defs.h>
 #include <krb5/hostaddr.h>
 #include <krb5/encryption.h>
 #include <krb5/fieldbits.h>
 
-#endif /* __KRB_GENERAL__ */
+#endif /* __KRB5_GENERAL__ */

diff --git a/src/include/krb5/mit-des.h b/src/include/krb5/mit-des.h
index 54b237ff2d4375c6200e9a0a0d71ea10b0c255e9..357030dc56839a1b8f6daa3ff2d4927c993fc9f2 100644 (file)
--- a/src/include/krb5/mit-des.h
+++ b/src/include/krb5/mit-des.h
@@ -11,10 +11,10 @@
  * MIT Data Encryption Standard software implementation declarations.
  */
 
-#include <krb5/mit-copyright.h>
+#include <krb5/copyright.h>
 
-#ifndef __MIT_DES__
-#define __MIT_DES__
+#ifndef __KRB5_MIT_DES__
+#define __KRB5_MIT_DES__
 
 typedef octet des_cblock[8];   /* crypto-block size */
 
@@ -33,4 +33,4 @@ typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16];
 
 #define DES_CBC_CKSUM_LENGTH           (4*sizeof(octet)) /* XXX ? */
 
-#endif /* __MIT_DES__ */
+#endif /* __KRB5_MIT_DES__ */

diff --git a/src/include/krb5/wordsize.h b/src/include/krb5/wordsize.h
index afcedf2c1fff5e3102165319590533cf490a7d89..004021e77030dcfef8db51a970978ffe70cbf96a 100644 (file)
--- a/src/include/krb5/wordsize.h
+++ b/src/include/krb5/wordsize.h
@@ -11,10 +11,10 @@
  * Word-size related definition.
  */
 
-#include <krb5/mit-copyright.h>
+#include <krb5/copyright.h>
 
-#ifndef __KRB_WORDSIZE__
-#define __KRB_WORDSIZE__
+#ifndef __KRB5_WORDSIZE__
+#define __KRB5_WORDSIZE__
 
 #ifdef BITS16
 #define __OK
@@ -36,4 +36,4 @@ typedef       unsigned char   octet;
 
 #undef __OK
 
-#endif /* __KRB_WORDSIZE__ */
+#endif /* __KRB5_WORDSIZE__ */