From 4cb02aa928d3e41f636d0e01356c7a3cb51018ee Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 4 Jan 2010 16:20:11 +0200 Subject: [PATCH] Re-enable mmap test in configure & fix the code build again - this stuff has been disabled for years, lets see what breaks... --- configure.ac | 5 +---- lib/fsm.c | 1 + rpmio/rpmfileutil.c | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index f0ce2a561..b31727381 100644 --- a/configure.ac +++ b/configure.ac @@ -514,10 +514,7 @@ AC_TYPE_SIZE_T dnl Checks for library functions. AC_FUNC_VPRINTF -dnl XXX don't want to re-enable code that's been unused for years at this -dnl point, but should offer good performance improvements, check after -dnl 4.4.2.1... -dnl AC_FUNC_MMAP +AC_FUNC_MMAP AC_CHECK_FUNCS(mtrace) AC_CHECK_FUNCS(strndup) diff --git a/lib/fsm.c b/lib/fsm.c index 5b10940da..2bea99346 100644 --- a/lib/fsm.c +++ b/lib/fsm.c @@ -880,6 +880,7 @@ static int writeFile(FSM_t fsm, int writeData) char * rdbuf = NULL; void * mapped = (void *)-1; size_t nmapped; + int xx; #endif rc = fsmNext(fsm, FSM_ROPEN); diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c index cb36ebe25..19dc5eb30 100644 --- a/rpmio/rpmfileutil.c +++ b/rpmio/rpmfileutil.c @@ -155,6 +155,7 @@ int rpmDoDigest(pgpHashAlgo algo, const char * fn,int asAscii, case URL_IS_UNKNOWN: #ifdef HAVE_MMAP if (pid == 0) { + int xx; DIGEST_CTX ctx; void * mapped;