From: jongfoster <jongfoster@users.sourceforge.net>
Date: Fri, 1 Jun 2001 17:57:11 +0000 (+0000)
Subject: This file now just includes JunkBuster's config.h, to prevent duplication
X-Git-Tag: v_2_9_9~426
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/@default-cgi@/faq/static/coding.html?a=commitdiff_plain;h=d5ba21b22ad4017fc1e8fcf433f55cd8bb0a5cd1;p=privoxy.git

This file now just includes JunkBuster's config.h, to prevent duplication
and make it easier to build.  (In fact, this file wasn't ever updated
before, so this is a bugfix).
---

diff --git a/pcre/config.h b/pcre/config.h
index 048b8c35..89b7ac4b 100644
--- a/pcre/config.h
+++ b/pcre/config.h
@@ -1,34 +1,5 @@
-/* config.h.  Generated automatically by configure.  */
 
-/* On Unix systems config.in is converted by configure into config.h. PCRE is
-written in Standard C, but there are a few non-standard things it can cope
-with, allowing it to run on SunOS4 and other "close to standard" systems.
+/* For JunkBuster, we just use JunkBuster's config.h */
 
-On a non-Unix system you should just copy this file into config.h and change
-the definitions of HAVE_STRERROR and HAVE_MEMMOVE to 1. Unfortunately, because
-of the way autoconf works, these cannot be made the defaults. If your system
-has bcopy() and not memmove(), change the definition of HAVE_BCOPY instead of
-HAVE_MEMMOVE. If your system has neither bcopy() nor memmove(), leave them both
-as 0; an emulation function will be used. */
+#include "../config.h"
 
-/* Define to empty if the keyword does not work. */
-
-/* #undef const */
-
-/* Define to `unsigned' if <stddef.h> doesn't define size_t. */
-
-/* #undef size_t */
-
-/* The following two definitions are mainly for the benefit of SunOS4, which
-doesn't have the strerror() or memmove() functions that should be present in
-all Standard C libraries. The macros HAVE_STRERROR and HAVE_MEMMOVE should
-normally be defined with the value 1 for other systems, but unfortunately we
-can't make this the default because "configure" files generated by autoconf
-will only change 0 to 1; they won't change 1 to 0 if the functions are not
-found. If HAVE_MEMMOVE is set to 1, the value of HAVE_BCOPY is not relevant. */
-
-#define HAVE_STRERROR 1
-#define HAVE_MEMMOVE  1
-#define HAVE_BCOPY    1
-
-/* End */