'Adjust extern C {} blocks.'

build/rpmbuild.h

@@ -14,6 +14,10 @@
 /* but this will be needed */
 #include "rpmspec.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** \ingroup rpmbuild
  * Bit(s) to control buildSpec() operation.
  */
@@ -73,10 +77,6 @@ typedef enum rpmParseState_e {
 #define STRIP_TRAILINGSPACE (1 << 0)
 #define STRIP_COMMENTS      (1 << 1)
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** \ingroup rpmbuild
  * Destroy uid/gid caches.
  */

build/rpmfc.h

@@ -3,6 +3,10 @@
 
 #include <magic.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern int _rpmfc_debug;
 
 /**
@@ -62,10 +66,6 @@ struct rpmfcTokens_s {
  */
 typedef struct rpmfcTokens_s * rpmfcToken;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Return helper output.
  * @param av		helper argv (with possible macros)

build/rpmspec.h

@@ -6,6 +6,10 @@
  *  The rpmSpec and Package data structures used during build.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** \ingroup rpmbuild
  */
 typedef struct Package_s * Package;
@@ -169,10 +173,6 @@ struct Package_s {
     Package next;
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** \ingroup rpmbuild
  * Create and initialize rpmSpec structure.
  * @return spec		spec file control structure

lib/idtx.h

@@ -3,6 +3,10 @@
 
 #include "rpmlib.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  *  * A rollback transaction id element.
  *   */
@@ -71,4 +75,8 @@ IDTX IDTXload(rpmts ts, rpmTag tag);
  */
 IDTX IDTXglob(rpmts ts, const char * globstr, rpmTag tag);
 
+#ifdef __cplusplus
+}   
+#endif
+
 #endif /* H_RPMIDTX */

lib/rpmal.h

@@ -6,6 +6,10 @@
  * Structures used for managing added/available package lists.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern int _rpmal_debug;
 
 /**
@@ -23,10 +27,6 @@ typedef void * rpmalKey;
  *   */
 typedef intptr_t rpmalNum;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Initialize available packckages, items, and directory list.
  * @param delta		no. of entries to add on each realloc

lib/rpmcli.h

@@ -11,15 +11,15 @@
 #include "argv.h"
 #include "idtx.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** \ingroup rpmcli
  * Should version 3 packages be produced?
  */
 extern int _noDirTokens;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** \ingroup rpmcli
  * Popt option table for options shared by all modes and executables.
  */

lib/rpmds.h

@@ -8,6 +8,10 @@
 
 #include "rpmps.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  */
 extern int _rpmds_debug;
@@ -41,10 +45,6 @@ struct rpmds_s {
 };
 #endif	/* _RPMDS_INTERNAL */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Unreference a dependency set instance.
  * @param ds		dependency set

lib/rpmfi.h

@@ -6,6 +6,10 @@
  * Structure(s) used for file info tag sets.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern int _rpmfi_debug;
 
 #if defined(_RPMFI_INTERNAL)
@@ -134,10 +138,6 @@ int nrefs;		/*!< Reference count. */
 
 #endif	/* _RPMFI_INTERNAL */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Unreference a file info set instance.
  * @param fi		file info set

lib/rpmgi.h

@@ -10,6 +10,10 @@
 #include "rpmts.h"
 #include "argv.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  */
 extern int _rpmgi_debug;
@@ -60,10 +64,6 @@ struct rpmgi_s {
 };
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Unreference a generalized iterator instance.
  * @param gi		generalized iterator

lib/rpmlib.h

@@ -14,6 +14,10 @@
 #include "header.h"
 #include <popt.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Package read return codes.
  */
@@ -37,10 +41,6 @@ extern const char * rpmEVR;
 
 extern int rpmFLAGS;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** \ingroup rpmtrans
  * The RPM Transaction Set.
  * Transaction sets are inherently unordered! RPM may reorder transaction

lib/rpmps.h

@@ -6,6 +6,10 @@
  * Structures and prototypes used for an "rpmps" problem set.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern int _rpmps_debug;
 
 /**
@@ -57,10 +61,6 @@ struct rpmps_s {
     int nrefs;			/*!< Reference count. */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Return formatted string representation of a problem.
  * @param prob		rpm problem

lib/rpmte.h

@@ -8,6 +8,10 @@
 
 #include "rpmal.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  */
 extern int _rpmte_debug;
@@ -113,10 +117,6 @@ struct rpmtsi_s {
 
 #endif	/* _RPMTE_INTERNAL */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Destroy a transaction element.
  * @param te		transaction element

lib/rpmts.h

@@ -9,6 +9,10 @@
 #include "rpmps.h"
 #include "rpmsw.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern int _rpmts_debug;
 extern int _rpmts_stats;
 extern int _fps_debug;
@@ -294,10 +298,6 @@ struct rpmts_s {
 };
 #endif	/* _RPMTS_INTERNAL */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** \ingroup rpmts
  * Check that all dependencies can be resolved.
  * @param ts		transaction set

lib/stringbuf.h

@@ -5,14 +5,14 @@
  *
  */
 
-/**
- */
-typedef struct StringBufRec *StringBuf;
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/**
+ */
+typedef struct StringBufRec *StringBuf;
+
 /**
  */
 StringBuf newStringBuf(void);

rpmio/argv.h

@@ -5,6 +5,10 @@
  * \file rpmio/argv.h
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef	const char * ARGstr_t;
 typedef ARGstr_t * ARGV_t;
 
@@ -15,10 +19,6 @@ struct ARGI_s {
 };
 typedef	struct ARGI_s * ARGI_t;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Print argv array elements.
  * @param msg		output message prefix (or NULL)

rpmio/rpmerr.h

@@ -8,6 +8,10 @@
 
 #include "rpmlog.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define	_em(_e)	\
     (((_e) << 16) | RPMLOG_MAKEPRI(RPMLOG_ERRMSG, RPMLOG_ERR))
 #define	_wm(_e)	\
@@ -120,5 +124,8 @@ typedef enum rpmerrCode_e {
 #define	rpmErrorSetCallback(_cb)	rpmlogSetCallback(_cb)
 typedef rpmlogCallback rpmErrorCallBackType;
 
+#ifdef __cplusplus
+}   
+#endif
 
 #endif  /* H_RPMERR */

rpmio/rpmio.h

@@ -14,6 +14,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  */
 typedef struct pgpDig_s * pgpDig;
@@ -46,10 +50,6 @@ typedef	struct _FD_s * FD_t;
  */
 typedef struct FDIO_s * FDIO_t;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** \ingroup rpmio
  * \name RPMIO Vectors.
  */

rpmio/rpmlog.h

@@ -9,6 +9,10 @@
 
 #include <stdarg.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * RPM Log levels.
  * priorities/facilities are encoded into a single 32-bit quantity, where the
@@ -157,10 +161,6 @@ typedef struct rpmlogRec_s {
     const char * message;
 } * rpmlogRec;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Return number of rpmError() ressages.
  * @return		number of messages

rpmio/rpmmacro.h

@@ -5,6 +5,10 @@
  * \file rpmio/rpmmacro.h
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*! The structure used to store a macro. */
 typedef struct rpmMacroEntry_s {
     struct rpmMacroEntry_s *prev;/*!< Macro entry stack. */
@@ -46,10 +50,6 @@ extern const char * macrofiles;
 #define	RMIL_OLDSPEC	-1
 #define	RMIL_GLOBAL	0
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Print macros to file stream.
  * @param mc		macro context (NULL uses global context).

rpmio/rpmmessages.h

@@ -8,6 +8,10 @@
 
 #include "rpmlog.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define	RPMMESS_DEBUG		RPMLOG_DEBUG
 #define	RPMMESS_VERBOSE		RPMLOG_INFO
 #define	RPMMESS_NORMAL		RPMLOG_NOTICE
@@ -60,10 +64,6 @@ typedef enum rpmCallbackType_e {
  */
 typedef void * rpmCallbackData;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  */
 typedef void * (*rpmCallbackFunction)

rpmio/rpmpgp.h

@@ -12,6 +12,10 @@
 
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if !defined(_BEECRYPT_API_H)
 typedef unsigned char byte;
 #endif	/* _BEECRYPT_API_H */
@@ -954,10 +958,6 @@ typedef enum rpmDigestFlags_e {
 } rpmDigestFlags;
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Return (native-endian) integer from big-endian representation.
  * @param s		pointer to big-endian integer

rpmio/rpmsq.h

@@ -8,6 +8,10 @@
 
 #include "rpmsw.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  */
 typedef struct rpmsig_s * rpmsig;
@@ -48,10 +52,6 @@ extern rpmsq rpmsqQueue;
 
 extern sigset_t rpmsqCaught;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Insert node into from queue.
  * @param elem		node to link

rpmio/rpmsw.h

@@ -5,6 +5,10 @@
  * \file rpmio/rpmsw.h
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** \ingroup rpmio
  */
 typedef unsigned long int rpmtime_t;
@@ -37,10 +41,6 @@ struct rpmop_s {
     rpmtime_t		usecs;	/*!< Number of ticks. */
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** Return benchmark time stamp.
  * @param *sw		time stamp
  * @return		0 on success

rpmio/rpmurl.h

@@ -7,6 +7,10 @@
 
 #include <assert.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Supported URL types.
  */
@@ -44,10 +48,6 @@ struct urlinfo_s {
     int magic;
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 extern int _url_debug;		/*!< URL debugging? */
 
 /**