X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=acconfig.h;h=fa6706b5448943c9ebb9aab05b505396fdedf66a;hp=bf746a6113df85f37492631056fcdf1e3b5750eb;hb=988e2e3c5aa4ca005dcdae7f9aab8a2d8e1d1801;hpb=97110184221edacdb7d4dfc29de0e38d63f4d831

diff --git a/acconfig.h b/acconfig.h
index bf746a61..fa6706b5 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -37,6 +37,21 @@
  *
  * Revisions   :
  *    $Log: acconfig.h,v $
+ *    Revision 1.26  2002/04/11 11:00:21  oes
+ *    Applied Moritz' fix for socklen_t on Solaris
+ *
+ *    Revision 1.25  2002/04/06 20:38:01  jongfoster
+ *    Renaming VC++ versions of config.h
+ *
+ *    Revision 1.24  2002/04/04 00:36:36  gliptak
+ *    always use pcre for matching
+ *
+ *    Revision 1.23  2002/04/03 22:28:03  gliptak
+ *    Removed references to gnu_regex
+ *
+ *    Revision 1.22  2002/03/26 22:29:54  swa
+ *    we have a new homepage!
+ *
  *    Revision 1.21  2002/03/24 14:31:08  swa
  *    remove more crappy files. set RPM
  *    release version correctly.
@@ -204,11 +219,6 @@
  */
 #undef VERSION_POINT
 
-/*
- * Version number - RPM-release
- */
-#undef VERSION_RPM_PACKAGE
-
 /*
  * Version number, as a string
  */
@@ -219,14 +229,6 @@
  */
 #undef CODE_STATUS
 
-/*
- * Regular expression matching for URLs.  (Highly recommended).
- * If neither of these are defined then you can ony use prefix matching.
- * Don't bother to change this here! Use configure instead.
- */
-#undef REGEX_GNU
-#undef REGEX_PCRE
-
 /* 
  * Should pcre be statically built in instead of linkling with libpcre?
  * (This is determined by configure depending on the availiability of
@@ -380,6 +382,11 @@
 #undef HAVE_GMTIME_R
 #undef HAVE_LOCALTIME_R
 
+/* Define to 'int' if <sys/socket.h> doesn't have it. 
+ */
+#undef socklen_t
+
+
 @BOTTOM@
 
 /*
@@ -415,7 +422,7 @@
  * the error messages understandable, by bailing out now.
  */
 #ifdef _MSC_VER
-#error For MS VC++, please use config.h.win or config.h.win32threads.win.  You can usually do this by selecting the "Build", "Clean" menu option.
+#error For MS VC++, please use vc_config_winthreads.h or vc_config_pthreads.h.  You can usually do this by selecting the "Build", "Clean" menu option.
 #endif /* def _MSC_VER */
 
 #endif /* CONFIG_H_INCLUDED */