Make header.h & dbindex.h C++-safe as well

CVS patchset: 2040
CVS date: 1998/03/20 05:15:08

diff --git a/CHANGES b/CHANGES
index 468765b..2446dc6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 2.4.104 -> 2.4.105:
        - added langpath: to rpmrc, and mark files with matches
-       - added some C++ cruft to rpmlib.h
+       - added some C++ cruft to rpmlib header files.
 
 2.4.103 -> 2.4.104:
        - fixed popt/Makefile.in to use CPP from configure

diff --git a/lib/dbindex.h b/lib/dbindex.h
index 33c42f5..89822b1 100644 (file)
--- a/lib/dbindex.h
+++ b/lib/dbindex.h
@@ -1,6 +1,10 @@
 #ifndef H_DBINDEX
 #define H_DBINDEX
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* this will break if sizeof(int) != 4 */
 
 #include <db.h>
@@ -34,4 +38,8 @@ int dbiRemoveIndexRecord(dbiIndexSet * set, dbiIndexRecord rec);
 dbiIndexSet dbiCreateIndexRecord(void);
 void dbiFreeIndexRecord(dbiIndexSet set);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

diff --git a/lib/header.h b/lib/header.h
index eeb99c5..cfe38b1 100644 (file)
--- a/lib/header.h
+++ b/lib/header.h
@@ -9,6 +9,10 @@
 #define H_HEADER
 #include <stdio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined(__alpha__)
 typedef long int int_64;
 typedef int int_32;
@@ -169,4 +173,8 @@ void headerSort(Header h);
 
 #define HEADER_I18NTABLE       100
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* H_HEADER */