diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-07-08 16:23:22 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-07-08 18:54:28 +0300 |
| commit | 27a6edd36d39e296e6b13e24974989ad5954abb9 (patch) | |
| tree | c2a6cefd950c2f856af4365edbced952bbfd9f7d /lib | |
| parent | 6778dc94ce0a9234ed74cf094d98e219a295070f (diff) | |
| download | librpm-tizen-27a6edd36d39e296e6b13e24974989ad5954abb9.tar.gz librpm-tizen-27a6edd36d39e296e6b13e24974989ad5954abb9.tar.bz2 librpm-tizen-27a6edd36d39e296e6b13e24974989ad5954abb9.zip | |
Add a new legacy compatibility header, kill rpmints.h
- build-time generated rpmints.h causes issues with distcheck and is
not really worth the trouble
- we have all sorts of legacy junk to deal with, sticking them all into
rpmints.h would be just wrong...
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rpmints.h.in | 29 | ||||
| -rw-r--r-- | lib/rpmlegacy.h | 29 | ||||
| -rw-r--r-- | lib/rpmtypes.h | 2 |
3 files changed, 30 insertions, 30 deletions
diff --git a/lib/rpmints.h.in b/lib/rpmints.h.in deleted file mode 100644 index ae4507b0b..000000000 --- a/lib/rpmints.h.in +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef _RPM_RPMINTS_H -#define _RPM_RPMINTS_H - -/* @cond NODOXYGEN */ -/* if rpm uses stdint.h */ -#undef __RPM_USES_STDINT_H__ -/* @endcond */ - -#ifdef __RPM_USES_STDINT_H__ -#include <stdint.h> -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -typedef int32_t int_32; /*!< @deprecated Provided for backward compatibility only. Don't use in new code. */ -typedef int16_t int_16; /*!< @deprecated Provided for backward compatibility only. Don't use in new code. */ -typedef int8_t int_8; /*!< @deprecated Provided for backward compatibility only. Don't use in new code. */ - -typedef uint32_t uint_32; /*!< @deprecated Provided for backward compatibility only. Don't use in new code. */ -typedef uint16_t uint_16; /*!< @deprecated Provided for backward compatibility only. Don't use in new code. */ -typedef uint8_t uint_8; /*!< @deprecated Provided for backward compatibility only. Don't use in new code. */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/lib/rpmlegacy.h b/lib/rpmlegacy.h new file mode 100644 index 000000000..f86a81a00 --- /dev/null +++ b/lib/rpmlegacy.h @@ -0,0 +1,29 @@ +#ifndef _RPMLEGACY_H +#define _RPMLEGACY_H + +#include <rpm/rpmtypes.h> + +/* ==================================================================== */ +/* LEGACY INTERFACES AND TYPES, DO NOT USE IN NEW CODE! */ +/* ==================================================================== */ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef _RPM_4_4_COMPAT + +/* mappings for legacy types */ +typedef int32_t int_32; +typedef int16_t int_16; +typedef int8_t int_8; +typedef uint32_t uint_32; +typedef uint16_t uint_16; +typedef uint8_t uint_8; +#endif /* _RPM_4_4_COMPAT */ + +#ifdef __cplusplus +} +#endif + +#endif /* _RPMLEGACY_H */ diff --git a/lib/rpmtypes.h b/lib/rpmtypes.h index e7dac323f..defd9e7e8 100644 --- a/lib/rpmtypes.h +++ b/lib/rpmtypes.h @@ -8,7 +8,7 @@ * @todo The grouping needs love to look sane... */ -#include <rpm/rpmints.h> +#include <stdint.h> #ifdef __cplusplus extern "C" { |