Return-Path: 
 <cvs-return-11852-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 1303 invoked by uid 500); 30 May 2002 05:57:34 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
list-post: <mailto:cvs@httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 1292 invoked by uid 500); 30 May 2002 05:57:34 -0000
Delivered-To: apmail-httpd-2.0-cvs@apache.org
Date: 30 May 2002 05:57:33 -0000
Message-ID: <20020530055733.98130.qmail@icarus.apache.org>
From: jwoolley@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/include ap_mmn.h
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jwoolley    02/05/29 22:57:33

  Modified:    include  ap_mmn.h
  Log:
  Imagine the horror.  I go to try compiling PHP4, and it bombs out on
  r->boundary.  BUT WAIT, I say, we have a test in there for that:
  #if !MODULE_MAGIC_AT_LEAST(20020506,0).  The test doesn't seem to be
  working.  That's odd, I think.  So I go look at the ap_mmn.h.  Egad,
  the tests are totally backwards.  How on earth are we going to handle this?
  Surely it's wrong in 1.3.x as well.  So I go look.  Nope, turns out it
  got fixed TWO YEARS AGO in that repository.  Sigh.  Anyway, thanks Greg.
  :)
  
  Submitted by:	Greg Stein, circa Apache 1.3.13
  
  Revision  Changes    Path
  1.46      +9 -6      httpd-2.0/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/ap_mmn.h,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -d -u -r1.45 -r1.46
  --- ap_mmn.h	30 May 2002 05:04:32 -0000	1.45
  +++ ap_mmn.h	30 May 2002 05:57:33 -0000	1.46
  @@ -114,7 +114,6 @@
   #define MODULE_MAGIC_NUMBER_MAJOR 20020529
   #endif
   #define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
  -#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR	/* backward compat */
   
   /**
    * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
  @@ -124,7 +123,7 @@
    * For example, suppose you wish to use the apr_table_overlap
    *    function.  You can do this:
    * 
  - * #if MODULE_MAGIC_AT_LEAST(19980812,2)
  + * #if AP_MODULE_MAGIC_AT_LEAST(19980812,2)
    *     ... use apr_table_overlap()
    * #else
    *     ... alternative code which doesn't use apr_table_overlap()
  @@ -132,11 +131,15 @@
    * </pre>
    * @param major The major module magic number
    * @param minor The minor module magic number
  - * @deffunc MODULE_MAGIC_AT_LEAST(int major, int minor)
  + * @deffunc AP_MODULE_MAGIC_AT_LEAST(int major, int minor)
    */
  -#define MODULE_MAGIC_AT_LEAST(major,minor)		\
  -    ((major) > MODULE_MAGIC_NUMBER_MAJOR 		\
  +#define AP_MODULE_MAGIC_AT_LEAST(major,minor)		\
  +    ((major) < MODULE_MAGIC_NUMBER_MAJOR 		\
   	|| ((major) == MODULE_MAGIC_NUMBER_MAJOR 	\
  -	    && (minor) >= MODULE_MAGIC_NUMBER_MINOR))
  +	    && (minor) <= MODULE_MAGIC_NUMBER_MINOR))
  +
  +/** @deprecated present for backwards compatibility */
  +#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR
  +#define MODULE_MAGIC_AT_LEAST old_broken_macro_we_hope_you_are_not_using
   
   #endif /* !APACHE_AP_MMN_H */