2001-06-05 Havoc Pennington <hp@redhat.com>

Author: hp
Date: 2001-06-05 17:45:02 GMT
2001-06-05  Havoc Pennington  <hp@redhat.com>

	* parse.c: never use flockfile, getc_unlocked

diff --git a/ChangeLog b/ChangeLog
index 7efc79bc8ebd3a79e85f4754644c6425d7c5fd59..008f94e71c7c70bd3e1fc2497f427307fe2501c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-05  Havoc Pennington  <hp@redhat.com>
+       
+       * parse.c: never use flockfile, getc_unlocked
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
        * pkg.m4: remove unrelated macros

diff --git a/configure.in b/configure.in
index 6ba746da9bc5dd7e875f6febb614d4659951f5ad..de029bff8904ffe99979896833acc08637184d4c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_INIT(pkg-config.1)
 
 AC_CONFIG_SUBDIRS(glib-1.2.8)
 
-AM_INIT_AUTOMAKE(pkgconfig, 0.6.0)
+AM_INIT_AUTOMAKE(pkgconfig, 0.7.0)
 
 AM_MAINTAINER_MODE
 
@@ -15,7 +15,6 @@ AC_PROG_CC
 
 AC_FUNC_ALLOCA
 
-AC_CHECK_FUNCS(flockfile)
 AC_CHECK_FUNCS(setresuid setreuid,break)
 
 AC_OUTPUT([Makefile])

diff --git a/parse.c b/parse.c
index 14959324a3eed5dd37961c51d7bc30a86d831721..87afbd4e517614c55121bf567b8c969e2a6fb4b1 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -12,11 +12,12 @@
 #include <sys/wait.h>
 #include <sys/types.h>
 
-#ifndef HAVE_FLOCKFILE
+/* since we never use getc_unlocked now we should really
+ * do something to speed up read_one_line
+ */
 #  define flockfile(f) (void)1
 #  define funlockfile(f) (void)1
 #  define getc_unlocked(f) getc(f)
-#endif /* !HAVE_FLOCKFILE */
 
 #ifdef NATIVE_WIN32