From 03d95de7a0138354698772d9c393bcb4a71a4279 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 9 Jul 2007 11:01:33 +0300
Subject: [PATCH] Fix include of misc.h, rpmpgp.h and rpmsq.h in C++.

---
 lib/misc.h     | 2 ++
 rpmio/rpmpgp.h | 6 ++++--
 rpmio/rpmsq.h  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/misc.h b/lib/misc.h
index 918fc37..7f90a39 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -6,6 +6,8 @@
  *
  */
 
+#include <string.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h
index dd5d18b..d90d4e7 100644
--- a/rpmio/rpmpgp.h
+++ b/rpmio/rpmpgp.h
@@ -10,6 +10,8 @@
  *	Copyright (C) The Internet Society (1998).  All Rights Reserved.
  */
 
+#include <string.h>
+
 #if !defined(_BEECRYPT_API_H)
 /*@-redef@*/
 typedef unsigned char byte;
@@ -1314,9 +1316,9 @@ int pgpIsPkt(const byte * p)
 	return 0;
 
     if (val & 0x40)
-	tag = (val & 0x3f);
+	tag = (pgpTag)(val & 0x3f);
     else
-	tag = (val >> 2) & 0xf;
+	tag = (pgpTag)((val >> 2) & 0xf);
 
     switch (tag) {
     case PGPTAG_MARKER:
diff --git a/rpmio/rpmsq.h b/rpmio/rpmsq.h
index 4223e42..f1ba5d4 100644
--- a/rpmio/rpmsq.h
+++ b/rpmio/rpmsq.h
@@ -58,7 +58,7 @@ extern rpmsq rpmsqQueue;
 extern sigset_t rpmsqCaught;
 
 #ifdef __cplusplus
-{
+extern "C" {
 #endif
 
 /**
-- 
2.7.4