gstein 00/07/14 01:09:34
Modified: src/include ap_mmn.h
Log:
MODULE_MAGIC_AT_LEAST was hopelessly broken. reimplement under a new name:
AP_MODULE_MAGIC_AT_LEAST. leave the old, but force breakage if somebody
happened to be using it (if they were, it probably is NOT working as
they expect).
Revision Changes Path
1.49 +8 -5 apache-1.3/src/include/ap_mmn.h
Index: ap_mmn.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ap_mmn.h 2000/06/22 23:34:20 1.48
+++ ap_mmn.h 2000/07/14 08:09:33 1.49
@@ -237,23 +237,26 @@
#define MODULE_MAGIC_NUMBER_MAJOR 19990320
#endif
#define MODULE_MAGIC_NUMBER_MINOR 9 /* 0...n */
-#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR /* backward compat */
/* Useful for testing for features. */
-#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))
/* For example, suppose you wish to use the ap_overlap_tables
function. You can do this:
-#if MODULE_MAGIC_AT_LEAST(19980812,2)
+#if AP_MODULE_MAGIC_AT_LEAST(19980812,2)
... use ap_overlap_tables()
#else
... alternative code which doesn't use ap_overlap_tables()
#endif
*/
+
+/* 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 */
|