- zlib: uniqify certain symbols to prevent name space pollution.
- macosx: include <sys/types.h> so that python sees the u_char typedef. CVS patchset: 7760 CVS date: 2005/02/12 19:03:32
This commit is contained in:
jbj
parent
4bfb4d6f3f
commit
66a6ab533f
2
CHANGES
2
CHANGES
|
|
@ -22,6 +22,8 @@
|
|||
- discover and use getmntinfo if present.
|
||||
- perform callbacks as always (#147537).
|
||||
- permit build scriptlet interpreters to be individually overridden.
|
||||
- zlib: uniqify certain symbols to prevent name space pollution.
|
||||
- macosx: include <sys/types.h> so that python sees the u_char typedef.
|
||||
|
||||
4.3.3 -> 4.4:
|
||||
- pentium3/pentium4 arch support (pluto@PLD).
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@ BUILT_SOURCES = listobjs
|
|||
|
||||
EXTRA_DIST = test.c
|
||||
|
||||
# XXX Make sure compress.c links internal zlib
|
||||
INCLUDES = -I. -I ../../zlib
|
||||
|
||||
pkglibdir = @prefix@/lib/rpm
|
||||
MAGIC = $(pkglibdir)/magic
|
||||
|
||||
|
|
@ -23,7 +26,7 @@ libmagic_la_LDFLAGS = -version-info 1:0:0
|
|||
|
||||
noinst_PROGRAMS = file
|
||||
file_SOURCES = file.c
|
||||
file_LDFLAGS = # -all-static
|
||||
file_LDFLAGS = -L../../zlib # -all-static
|
||||
file_LDADD = libmagic.la
|
||||
|
||||
listobjs:
|
||||
|
|
|
|||
|
|
@ -88,6 +88,10 @@
|
|||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
#if defined(__APPLE__)
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#include <Python.h>
|
||||
#include <stddef.h> /* for offsetof() */
|
||||
#include <db.h>
|
||||
|
|
@ -102,7 +106,7 @@
|
|||
#endif
|
||||
|
||||
#define PY_BSDDB_VERSION "4.2.4"
|
||||
static char *rcs_id = "$Id: _rpmdb.c,v 1.14 2004/11/17 17:05:39 pauln Exp $";
|
||||
static char *rcs_id = "$Id: _rpmdb.c,v 1.14.2.1 2005/02/12 19:03:32 jbj Exp $";
|
||||
|
||||
|
||||
#ifdef WITH_THREAD
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
/*@unchecked@*/
|
||||
/*@-shadow@*/
|
||||
static int _rpmts_debug = 0;
|
||||
extern int _rpmts_debug;
|
||||
/*@=shadow@*/
|
||||
|
||||
/*@access alKey @*/
|
||||
|
|
|
|||
|
|
@ -5,6 +5,10 @@
|
|||
#ifndef H_SYSTEM_PYTHON
|
||||
#define H_SYSTEM_PYTHON
|
||||
|
||||
#if defined(__APPLE__)
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#include "Python.h"
|
||||
|
||||
#ifdef __LCLINT__
|
||||
|
|
|
|||
94
zlib/zconf.h
94
zlib/zconf.h
|
|
@ -14,43 +14,53 @@
|
|||
*/
|
||||
#define Z_PREFIX
|
||||
#ifdef Z_PREFIX
|
||||
# define deflateInit_ rpmz_deflateInit_
|
||||
# define deflate rpmz_deflate
|
||||
# define deflateEnd rpmz_deflateEnd
|
||||
# define inflateInit_ rpmz_inflateInit_
|
||||
# define inflate rpmz_inflate
|
||||
# define inflateEnd rpmz_inflateEnd
|
||||
# define deflateInit2_ rpmz_deflateInit2_
|
||||
# define deflateSetDictionary rpmz_deflateSetDictionary
|
||||
# define deflateSetHeader rpmz_deflateSetHeader
|
||||
# define deflateCopy rpmz_deflateCopy
|
||||
# define deflateReset rpmz_deflateReset
|
||||
# define deflateParams rpmz_deflateParams
|
||||
# define deflateBound rpmz_deflateBound
|
||||
# define deflatePrime rpmz_deflatePrime
|
||||
# define inflateInit2_ rpmz_inflateInit2_
|
||||
# define inflateSetDictionary rpmz_inflateSetDictionary
|
||||
# define inflateSync rpmz_inflateSync
|
||||
# define inflateSyncPoint rpmz_inflateSyncPoint
|
||||
# define inflateCopy rpmz_inflateCopy
|
||||
# define inflateReset rpmz_inflateReset
|
||||
# define inflateBack rpmz_inflateBack
|
||||
# define inflateBackEnd rpmz_inflateBackEnd
|
||||
# define compress rpmz_compress
|
||||
# define compress2 rpmz_compress2
|
||||
# define compressBound rpmz_compressBound
|
||||
# define uncompress rpmz_uncompress
|
||||
# define adler32 rpmz_adler32
|
||||
# define adler32_combine rpmz_adler32_combine
|
||||
# define crc32 rpmz_crc32
|
||||
# define crc32_combine rpmz_crc32_combine
|
||||
# define get_crc_table rpmz_get_crc_table
|
||||
# define zError rpmz_zError
|
||||
|
||||
# define deflateInit_ rpmz_deflateInit_
|
||||
# define deflate rpmz_deflate
|
||||
# define deflateEnd rpmz_deflateEnd
|
||||
# define inflateInit_ rpmz_inflateInit_
|
||||
# define inflate rpmz_inflate
|
||||
# define inflateEnd rpmz_inflateEnd
|
||||
# define deflateInit2_ rpmz_deflateInit2_
|
||||
# define deflateSetDictionary rpmz_deflateSetDictionary
|
||||
# define deflateCopy rpmz_deflateCopy
|
||||
# define deflateReset rpmz_deflateReset
|
||||
# define deflateParams rpmz_deflateParams
|
||||
# define deflateBound rpmz_deflateBound
|
||||
# define inflateInit2_ rpmz_inflateInit2_
|
||||
# define inflateSetDictionary rpmz_inflateSetDictionary
|
||||
# define inflateSync rpmz_inflateSync
|
||||
# define inflateSyncPoint rpmz_inflateSyncPoint
|
||||
# define inflateCopy rpmz_inflateCopy
|
||||
# define inflateReset rpmz_inflateReset
|
||||
# define compress rpmz_compress
|
||||
# define compress2 rpmz_compress2
|
||||
# define compressBound rpmz_compressBound
|
||||
# define uncompress rpmz_uncompress
|
||||
# define adler32 rpmz_adler32
|
||||
# define crc32 rpmz_crc32
|
||||
# define get_crc_table rpmz_get_crc_table
|
||||
|
||||
# define Byte rpmz_Byte
|
||||
# define uInt rpmz_uInt
|
||||
# define uLong rpmz_uLong
|
||||
# define Bytef rpmz_Bytef
|
||||
# define charf rpmz_charf
|
||||
# define intf rpmz_intf
|
||||
# define uIntf rpmz_uIntf
|
||||
# define uLongf rpmz_uLongf
|
||||
# define voidpf rpmz_voidpf
|
||||
# define voidp rpmz_voidp
|
||||
# define alloc_func rpmz_alloc_func
|
||||
# define free_func rpmz_free_func
|
||||
# define in_func rpmz_in_func
|
||||
# define out_func rpmz_out_func
|
||||
# define Byte rpmz_Byte
|
||||
# define uInt rpmz_uInt
|
||||
# define uLong rpmz_uLong
|
||||
# define Bytef rpmz_Bytef
|
||||
# define charf rpmz_charf
|
||||
# define intf rpmz_intf
|
||||
# define uIntf rpmz_uIntf
|
||||
# define uLongf rpmz_uLongf
|
||||
# define voidpf rpmz_voidpf
|
||||
# define voidp rpmz_voidp
|
||||
|
||||
# define gzclose rpmz_gzclose
|
||||
# define gzdopen rpmz_gzdopen
|
||||
|
|
@ -72,9 +82,13 @@
|
|||
# define gztell rpmz_gztell
|
||||
# define gzwrite rpmz_gzwrite
|
||||
|
||||
# define gzclearerr rpmz_gzclearerr
|
||||
# define gzungetc rpmz_gzungetc
|
||||
|
||||
# define inflateBack rpmz_inflateBack
|
||||
# define inflateBackEnd rpmz_inflateBackEnd
|
||||
# define inflateBackInit_ rpmz_inflateBackInit_
|
||||
# define inflateGetHeader rpmz_inflateGetHeader
|
||||
# define inflate_fast rpmz_inflate_fast
|
||||
# define inflate_table rpmz_inflate_table
|
||||
# define _tr_align rpmz__tr_align
|
||||
|
|
@ -87,6 +101,7 @@
|
|||
# define z_errmsg rpmz_z_errmsg
|
||||
# define zError rpmz_zError
|
||||
# define zlibVersion rpmz_zlibVersion
|
||||
# define zlibCompileFlags rpmz_zlibCompileFlags
|
||||
|
||||
# define deflate_copyright rpmz_deflate_copyright
|
||||
# define inflate_copyright rpmz_inflate_copyright
|
||||
|
|
@ -136,9 +151,6 @@
|
|||
# endif
|
||||
# endif
|
||||
#endif
|
||||
#if defined(__LCLINT__)
|
||||
# define STDC
|
||||
#endif
|
||||
#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
|
||||
# define STDC
|
||||
#endif
|
||||
|
|
@ -201,7 +213,7 @@
|
|||
/* Type declarations */
|
||||
|
||||
#ifndef OF /* function prototypes */
|
||||
# ifdef STDC
|
||||
# if defined(STDC) || defined(__LCLINT__)
|
||||
# define OF(args) args
|
||||
# else
|
||||
# define OF(args) ()
|
||||
|
|
@ -306,9 +318,11 @@ typedef unsigned long uLong; /* 32 bits or more */
|
|||
#else
|
||||
typedef Byte FAR Bytef;
|
||||
#endif
|
||||
/*@-typeuse@*/
|
||||
typedef char FAR charf;
|
||||
typedef int FAR intf;
|
||||
typedef uInt FAR uIntf;
|
||||
/*@=typeuse@*/
|
||||
typedef uLong FAR uLongf;
|
||||
|
||||
#ifdef STDC
|
||||
|
|
|
|||
Loading…
Reference in New Issue