* krb5.hin: Wrap all declarations in `extern "C"' for C++, not just some. Move

header file inclusions up above extern-C block.  (Fixes PR 729 from Chas
Williams.)

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

2 files changed, 20 insertions, 37 deletions

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 6bd882e3be..2eabec1007 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-03  Ken Raeburn  <raeburn@mit.edu>
+
+	* krb5.hin: Wrap all declarations in `extern "C"' for C++, not
+	just some.  Move header file inclusions up above extern-C block.
+
 1997-07-26 Miro Jurisic <meeroh@mit.edu>
 	* win-mac.h (size_t): Fixed size_t redefinition on MacOS
 	
diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 020196e4e2..0f4836a0b5 100644
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -89,6 +89,21 @@
 #include <stdlib.h>
 
 /*
+ * begin "error_def.h"
+ */
+
+#include <profile.h>
+#include <errno.h>
+
+/*
+ * end "error_def.h"
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
  * begin wordsize.h
  */
 
@@ -381,10 +396,6 @@ typedef struct _krb5_enc_data {
 #define krb5_xc(ptr,args) ((*(ptr)) args)
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 KRB5_DLLIMP krb5_error_code KRB5_CALLCONV
     krb5_c_encrypt
     KRB5_PROTOTYPE((krb5_context context, krb5_const krb5_keyblock *key,
@@ -580,10 +591,6 @@ krb5_error_code krb5_decrypt_data
 
 #endif /* KRB5_OLD_CRYPTO */
 
-#ifdef __cplusplus
-}
-#endif
-
 /*
  * end "encryption.h"
  */
@@ -819,17 +826,6 @@ krb5_error_code krb5_decrypt_data
  * end "proto.h"
  */
 
-/*
- * begin "error_def.h"
- */
-
-#include <profile.h>
-#include <errno.h>
-
-/*
- * end "error_def.h"
- */
-
 /* Time set */
 typedef struct _krb5_ticket_times {
     krb5_timestamp authtime; /* XXX ? should ktime in KDC_REP == authtime
@@ -1238,10 +1234,6 @@ typedef struct _krb5_rc_ops {
 	KRB5_NPROTOTYPE((krb5_context, krb5_rcache, char FAR *));
 } krb5_rc_ops;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 krb5_error_code krb5_rc_default 
 	KRB5_PROTOTYPE((krb5_context,
 		krb5_rcache FAR *));
@@ -1266,10 +1258,6 @@ krb5_error_code krb5_auth_to_rep
 		krb5_tkt_authent FAR *,
 		krb5_donot_replay FAR *));
 
-#ifdef __cplusplus
-}
-#endif
-
 
 #define krb5_rc_initialize(context, id, span) krb5_x((id)->ops->init,(context, id, span))
 #define krb5_rc_recover(context, id) krb5_x((id)->ops->recover,(context, id))
@@ -1384,10 +1372,6 @@ extern krb5_kt_ops krb5_kt_dfl_ops;
  * begin "func-proto.h"
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_init_context
 	KRB5_PROTOTYPE((krb5_context FAR *));
 KRB5_DLLIMP void KRB5_CALLCONV krb5_free_context
@@ -2225,9 +2209,6 @@ KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_timestamp_to_sfstring
 KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_deltat_to_string
 	KRB5_PROTOTYPE((krb5_deltat, char FAR *, size_t));
 
-#ifdef __cplusplus
-}
-#endif
 
 
 /* The name of the Kerberos ticket granting service... and its size */
@@ -2397,9 +2378,6 @@ KRB5_PROTOTYPE((krb5_context context,
 /*
  * The realm iterator functions
  */
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 KRB5_DLLIMP krb5_error_code KRB5_CALLCONV krb5_realm_iterator_create
 	KRB5_PROTOTYPE((krb5_context context, void **iter_p));