diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-06-15 01:02:03 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-06-15 01:02:03 +0000 |
| commit | 6e9e84a58cd612c1e167d6c35b5df811f2d71c9d (patch) | |
| tree | c76a32a9d0736ae4d3671aa7062f7fb6a060c5ce /src | |
| parent | a819d4c2fec9d03752e6c857bdc0eddae976f576 (diff) | |
| download | krb5-6e9e84a58cd612c1e167d6c35b5df811f2d71c9d.tar.gz krb5-6e9e84a58cd612c1e167d6c35b5df811f2d71c9d.tar.xz krb5-6e9e84a58cd612c1e167d6c35b5df811f2d71c9d.zip | |
* krb524.h: Change multiple-inclusion test macro to not stomp on
implementation namespace. Fix up BEGIN_DECLS.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14509 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/krb524/ChangeLog | 3 | ||||
| -rw-r--r-- | src/krb524/krb524.h | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 6601e393e..93585d216 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,5 +1,8 @@ 2002-06-14 Tom Yu <tlyu@mit.edu> + * krb524.h: Change multiple-inclusion test macro to not stomp on + implementation namespace. Fix up BEGIN_DECLS. + * krb524.h: Back out erroneous merge of post-1.2.5 change temporarily. diff --git a/src/krb524/krb524.h b/src/krb524/krb524.h index 552058df0..50645ff75 100644 --- a/src/krb524/krb524.h +++ b/src/krb524/krb524.h @@ -20,8 +20,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifndef __KRB524_H__ -#define __KRB524_H__ +#ifndef KRB524_H +#define KRB524_H #define KRB524_SERVICE "krb524" #define KRB524_PORT 4444 @@ -38,13 +38,15 @@ #endif #endif -#if defined(__cplusplus) && !defined(KRB524INT_BEGIN_DECLS) +#ifndef KRB524INT_BEGIN_DECLS +#ifdef __cplusplus #define KRB524INT_BEGIN_DECLS extern "C" { #define KRB524INT_END_DECLS } #else #define KRB524INT_BEGIN_DECLS #define KRB524INT_END_DECLS #endif +#endif #if TARGET_OS_MAC #if defined(__MWERKS__) @@ -120,4 +122,4 @@ int krb524_sendto_kdc KRB524INT_END_DECLS -#endif /* __KRB524_H__ */ +#endif /* KRB524_H */ |