summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2009-04-25 09:36:11 +0000
committerKen Raeburn <raeburn@mit.edu>2009-04-25 09:36:11 +0000
commit10c0b36c72eb2b38811494c4fa2adbc734b66237 (patch)
treedd5f4211ea4f75fc2e1f3454e0593da3c1212f7a /src/lib
parent582aabf279c16a3a55cc44c958130ada29e46e41 (diff)
downloadkrb5-10c0b36c72eb2b38811494c4fa2adbc734b66237.tar.gz
krb5-10c0b36c72eb2b38811494c4fa2adbc734b66237.tar.xz
krb5-10c0b36c72eb2b38811494c4fa2adbc734b66237.zip
make installed headers C++-safe
Now that we're installing the kadm5 headers, they should be C++-safe like the others. Wrap the content in 'extern "C"' if compiling as C++. New test program to verify. ticket: 6477 target_version: 1.7 tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22280 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/kadm5/admin.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h
index a9e01768f..57e2586f2 100644
--- a/src/lib/kadm5/admin.h
+++ b/src/lib/kadm5/admin.h
@@ -56,6 +56,18 @@
#include <kadm5/kadm_err.h>
#include <kadm5/chpass_util_strings.h>
+#ifndef KADM5INT_BEGIN_DECLS
+#if defined(__cplusplus)
+#define KADM5INT_BEGIN_DECLS extern "C" {
+#define KADM5INT_END_DECLS }
+#else
+#define KADM5INT_BEGIN_DECLS
+#define KADM5INT_END_DECLS
+#endif
+#endif
+
+KADM5INT_BEGIN_DECLS
+
#define KADM5_ADMIN_SERVICE "kadmin/admin"
#define KADM5_CHANGEPW_SERVICE "kadmin/changepw"
#define KADM5_HIST_PRINCIPAL "kadmin/history"
@@ -790,4 +802,6 @@ ovsec_kadm_ret_t ovsec_kadm_get_policies(void *server_handle,
#endif /* USE_KADM5_API_VERSION == 1 */
+KADM5INT_END_DECLS
+
#endif /* __KADM5_ADMIN_H__ */