Move string pool typedefs to rpmtypes.h

- I suspect these will be used widely, to avoid having to include
  rpmstrpool.h all over in headers...

diff --git a/lib/rpmtypes.h b/lib/rpmtypes.h
index 28ee5a9..91ea949 100644 (file)
--- a/lib/rpmtypes.h
+++ b/lib/rpmtypes.h
@@ -77,6 +77,9 @@ typedef void * rpmCallbackData;
 typedef struct rpmPubkey_s * rpmPubkey;
 typedef struct rpmKeyring_s * rpmKeyring;
 
+typedef uint32_t rpmsid;
+typedef struct rpmstrPool_s * rpmstrPool;
+
 typedef struct rpmPlugins_s * rpmPlugins;
 
 typedef struct rpmgi_s * rpmgi;

diff --git a/rpmio/rpmstrpool.h b/rpmio/rpmstrpool.h
index bc1ed88..958a470 100644 (file)
--- a/rpmio/rpmstrpool.h
+++ b/rpmio/rpmstrpool.h
@@ -1,8 +1,7 @@
 #ifndef _RPMSTRPOOL_H
 #define _RPMSTRPOOL_H
 
-typedef uint32_t rpmsid;
-typedef struct rpmstrPool_s * rpmstrPool;
+#include <rpm/rpmtypes.h>
 
 #ifdef __cplusplus
 extern "C" {