diff options
| author | Stef Walter <stef@thewalter.net> | 2004-08-23 22:50:10 +0000 |
|---|---|---|
| committer | Stef Walter <stef@thewalter.net> | 2004-08-23 22:50:10 +0000 |
| commit | 82d27b14e9e3ac81e7fd37092806ef6ad685683b (patch) | |
| tree | 0d6402dca7099f16865f19577786e8a8a581bdb8 | |
| parent | ff26b4137c6dc3d622336e725bd6f5630b301027 (diff) | |
Fixes for windows
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | common/binfile.c | 2 | ||||
| -rw-r--r-- | config.win32.h | 9 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | lib/rlib.c | 2 |
5 files changed, 15 insertions, 7 deletions
@@ -1,3 +1,6 @@ +Version 2.3.2e + - Use <stdlib.h> instead of <malloc.h> + Version 2.3.1b - Use reallocf instead of realloc - Unbuffered mode works with nonseekable files (stdin) diff --git a/common/binfile.c b/common/binfile.c index fa0a120..778b50e 100644 --- a/common/binfile.c +++ b/common/binfile.c @@ -18,7 +18,7 @@ */ #include <stdio.h> #include <string.h> -#include <malloc.h> +#include <stdlib.h> #include "binfile.h" #define BF_FILE 0x00000010 diff --git a/config.win32.h b/config.win32.h index 13a057a..011f67b 100644 --- a/config.win32.h +++ b/config.win32.h @@ -188,13 +188,13 @@ #define PACKAGE_NAME "rep" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "rep 2.1.2b" +#define PACKAGE_STRING "rep 2.3.2e" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "rep" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.1.2b" +#define PACKAGE_VERSION "2.3.2e" /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be @@ -208,7 +208,10 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "2.1.1b" +#define VERSION "2.3.2e" + +/* PCRE header path */ +#define PCRE_H "pcre/pcre.h" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/configure.in b/configure.in index b1edc18..785ca07 100644 --- a/configure.in +++ b/configure.in @@ -35,9 +35,11 @@ dnl CONTRIBUTORS dnl Nate Nielsen <nielsen@memberwebs.com> dnl -AC_INIT(rep, 2.3.2c, nielsen@memberwebs.com) -AM_INIT_AUTOMAKE(rep, 2.3.2c) +AC_INIT(rep, 2.3.2e, nielsen@memberwebs.com) +AM_INIT_AUTOMAKE(rep, 2.3.2e) +CFLAGS="$CFLAGS -I/usr/local/include" +CPPFLAGS="$CPPFLAGS -I/usr/local/include" LDFLAGS="$LDFLAGS -L/usr/local/lib" AC_CONFIG_SRCDIR([src/rep.c]) @@ -497,7 +497,7 @@ int repFile(r_context* ctx, FILE* fIn) ctx->stream.availIn = 0; /* While we either have more data to put in or more output... */ - while(!feof(fIn) || r == R_DONE) + while(r != R_DONE) { /* If rlib wants data then give it */ if(r == R_IN) |