From d2bb9d38c90d8028989cb414bf84b132b0bbc967 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 7 Sep 2012 14:09:35 +0300
Subject: [PATCH] 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...
---
 lib/rpmtypes.h     | 3 +++
 rpmio/rpmstrpool.h | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/rpmtypes.h b/lib/rpmtypes.h
index 28ee5a9..91ea949 100644
--- 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
--- 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" {
-- 
2.7.4