Add c++ guards to internal headers and sources as needed

lib/rpmug.h

@@ -4,6 +4,10 @@
 #include <rpm/rpmutil.h>
 #include <sys/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 RPM_GNUC_INTERNAL
 int rpmugUid(const char * name, uid_t * uid);
 
@@ -19,4 +23,9 @@ const char * rpmugGname(gid_t gid);
 RPM_GNUC_INTERNAL
 void rpmugFree(void);
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _RPMUG_H */

rpmio/rpmpgp_sequoia.c

@@ -24,6 +24,10 @@
     return _##f args;          \
   }
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 W(int, pgpSignatureType, (pgpDigParams _digp), (_digp))
 W(pgpDigParams, pgpDigParamsFree, (pgpDigParams digp), (digp))
 W(int, pgpDigParamsCmp, (pgpDigParams p1, pgpDigParams p2), (p1, p2))
@@ -80,3 +84,8 @@ W(int, rpmDigestUpdate, (DIGEST_CTX ctx, const void * data, size_t len),
 W(int, rpmDigestFinal,
   (DIGEST_CTX ctx, void ** datap, size_t *lenp, int asAscii),
   (ctx, datap, lenp, asAscii))
+
+#ifdef __cplusplus
+}
+#endif
+

sign/rpmsignfiles.c

@@ -5,7 +5,6 @@
  */
 
 #include "system.h"
-#include "imaevm.h"
 
 #include <string.h>
 #include <rpm/rpmstring.h>

sign/rpmsignfiles.h

@@ -8,6 +8,9 @@
 extern "C" {
 #endif
 
+/* This doesn't have c++ guards on its own */
+#include <imaevm.h>
+
 /**
  * Sign file digests in header into signature header
  * @param sigh		package signature header

tools/cliutils.h

@@ -13,6 +13,10 @@
 /* "normalized" exit: avoid overflowing and xargs special value 255 */
 #define RETVAL(rc) (((rc) > 254) ? 254 : (rc))
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 RPM_GNUC_NORETURN
 void argerror(const char * desc);
 
@@ -22,4 +26,8 @@ int initPipe(void);
 
 int finishPipe(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _CLIUTIL_H */