Relevant BUGIDs: 111645

Purpose of commit: bugfix

Commit summary:
---------------
C++ support was broken for PAM-applications, this checkin should fix it.
I've received this bug report from numerous folk.

2 files changed, 5 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 03efefb8..42862323 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@ TODO:
   file, instead of failing immediately (Bug 108845 - fix vorlon)
 * fix to pam_shells: logged information was not formatted correctly
   (extra comma) (Bug 111491 - fix vorlon)
+* fix for C++ application support (Bug 111645 - fix agmorgan)
 
 Planning to include:
 
diff --git a/libpam/include/security/pam_appl.h b/libpam/include/security/pam_appl.h
index 2849970a..b2eeb9f0 100644
--- a/libpam/include/security/pam_appl.h
+++ b/libpam/include/security/pam_appl.h
@@ -16,14 +16,14 @@
 #ifndef _SECURITY_PAM_APPL_H
 #define _SECURITY_PAM_APPL_H
 
-#include <security/_pam_types.h>      /* Linux-PAM common defined types */
-
-/* -------------- The Linux-PAM Framework layer API ------------- */
-
 #ifdef __cplusplus
 extern "C" {
 #endif
  
+#include <security/_pam_types.h>      /* Linux-PAM common defined types */
+
+/* -------------- The Linux-PAM Framework layer API ------------- */
+
 extern int pam_start(const char *service_name, const char *user,
 		     const struct pam_conv *pam_conversation,
 		     pam_handle_t **pamh);