* 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

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 6601e393ef3d9e96688d260821d79e297ea866da..93585d216e184644f37045dea4ce4a1f7365d92e 100644 (file)
--- 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 552058df02fc8abfc739251ef045a75155af9fcc..50645ff75f4c296c03af2150212abd1657479537 100644 (file)
--- 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 */