From: Tom Yu <tlyu@mit.edu>
Date: Sat, 15 Jun 2002 01:02:03 +0000 (+0000)
Subject: 	* krb524.h: Change multiple-inclusion test macro to not stomp on
X-Git-Tag: krb5-1.3-alpha1~704
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6e9e84a58cd612c1e167d6c35b5df811f2d71c9d;p=krb5.git

	* 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 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 */