diff options
| author | John Kohl <jtkohl@mit.edu> | 1989-11-27 11:45:09 +0000 |
|---|---|---|
| committer | John Kohl <jtkohl@mit.edu> | 1989-11-27 11:45:09 +0000 |
| commit | 57ac81f941aa444357c32c06812a584fa1a228bb (patch) | |
| tree | a095b942fc8ab658111d7e461bc1cd89550e156c /src/include | |
| parent | d3c3dd971ac1f205882a495e933c6d04b5e439ec (diff) | |
| download | krb5-57ac81f941aa444357c32c06812a584fa1a228bb.tar.gz krb5-57ac81f941aa444357c32c06812a584fa1a228bb.tar.xz krb5-57ac81f941aa444357c32c06812a584fa1a228bb.zip | |
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
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/krb5/base-defs.h | 8 | ||||
| -rw-r--r-- | src/include/krb5/hostaddr.h | 8 | ||||
| -rw-r--r-- | src/include/krb5/krb5.h | 10 | ||||
| -rw-r--r-- | src/include/krb5/mit-des.h | 8 | ||||
| -rw-r--r-- | src/include/krb5/wordsize.h | 8 |
5 files changed, 22 insertions, 20 deletions
diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h index 1556452c0..d9a2cad12 100644 --- 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 4ea4cce32..9a1371ec2 100644 --- 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 aacf802aa..54feb7137 100644 --- 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 54b237ff2..357030dc5 100644 --- 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 afcedf2c1..004021e77 100644 --- 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__ */ |