You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@apache.org on 2003/03/06 18:56:05 UTC
cvs commit: httpd-2.0/server util_debug.c
striker 2003/03/06 09:56:05
Modified: include http_config.h httpd.h
server util_debug.c
Log:
* include/http_config.h
(ap_get_module_config, ap_set_module_config): Always declare.
* include/httpd.h
(ap_strchr, ap_strchr_c, ap_strrchr, ap_strrchr_c, ap_strstr, ap_strstr_c):
Always declare.
* server/util_debug.c
(ap_get_module_config, ap_set_module_config, ap_strchr, ap_strchr_c,
ap_strrchr, ap_strrchr_c, ap_strstr, ap_strstr_c):
Always implement and export.
Revision Changes Path
1.100 +1 -2 httpd-2.0/include/http_config.h
Index: http_config.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/http_config.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- http_config.h 17 Feb 2003 07:04:50 -0000 1.99
+++ http_config.h 6 Mar 2003 17:56:04 -0000 1.100
@@ -459,7 +459,6 @@
/** configuration vector structure */
typedef struct ap_conf_vector_t ap_conf_vector_t;
-#if defined(AP_DEBUG) || defined(DOXYGEN)
/**
* Generic accessors for other modules to get at their own module-specific
* data
@@ -482,7 +481,7 @@
AP_DECLARE(void) ap_set_module_config(ap_conf_vector_t *cv, const module *m,
void *val);
-#else /* AP_DEBUG */
+#if defined(AP_DEBUG)
#define ap_get_module_config(v,m) \
(((void **)(v))[(m)->module_index])
1.195 +7 -7 httpd-2.0/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/httpd.h,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- httpd.h 3 Feb 2003 17:52:53 -0000 1.194
+++ httpd.h 6 Mar 2003 17:56:04 -0000 1.195
@@ -1697,6 +1697,13 @@
*/
#include <string.h>
+AP_DECLARE(char *) ap_strchr(char *s, int c);
+AP_DECLARE(const char *) ap_strchr_c(const char *s, int c);
+AP_DECLARE(char *) ap_strrchr(char *s, int c);
+AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c);
+AP_DECLARE(char *) ap_strstr(char *s, const char *c);
+AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c);
+
#ifdef AP_DEBUG
#undef strchr
@@ -1705,13 +1712,6 @@
# define strrchr(s, c) ap_strrchr(s,c)
#undef strstr
# define strstr(s, c) ap_strstr(s,c)
-
-AP_DECLARE(char *) ap_strchr(char *s, int c);
-AP_DECLARE(const char *) ap_strchr_c(const char *s, int c);
-AP_DECLARE(char *) ap_strrchr(char *s, int c);
-AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c);
-AP_DECLARE(char *) ap_strstr(char *s, const char *c);
-AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c);
#else
1.10 +56 -6 httpd-2.0/server/util_debug.c
Index: util_debug.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util_debug.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- util_debug.c 3 Feb 2003 17:53:20 -0000 1.9
+++ util_debug.c 6 Mar 2003 17:56:05 -0000 1.10
@@ -62,38 +62,85 @@
#include "httpd.h"
#include "http_config.h"
-#ifdef AP_DEBUG
-
-/* get rid of the macros we defined in httpd.h */
+/* Possibly get rid of the macros we defined in httpd.h */
+#if defined(strchr)
#undef strchr
+#endif
+
+#if defined (strrchr)
#undef strrchr
+#endif
+
+#if defined (strstr)
#undef strstr
+#endif
+
+
+#if defined(ap_strchr)
+#undef ap_strchr
+AP_DECLARE(char *) ap_strchr(char *s, int c);
+#endif
AP_DECLARE(char *) ap_strchr(char *s, int c)
{
return strchr(s,c);
}
+
+#if defined(ap_strchr_c)
+#undef ap_strchr_c
+AP_DECLARE(const char *) ap_strchr_c(const char *s, int c);
+#endif
+
AP_DECLARE(const char *) ap_strchr_c(const char *s, int c)
{
return strchr(s,c);
}
+
+#if defined(ap_strrchr)
+#undef ap_strrchr
+AP_DECLARE(char *) ap_strrchr(char *s, int c);
+#endif
+
AP_DECLARE(char *) ap_strrchr(char *s, int c)
{
return strrchr(s,c);
}
+
+#if defined(ap_strrchr_c)
+#undef ap_strrchr_c
+AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c);
+#endif
+
AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c)
{
return strrchr(s,c);
}
+
+#if defined(ap_strstr)
+#undef ap_strstr
+AP_DECLARE(char *) ap_strstr(char *s, const char *c);
+#endif
+
AP_DECLARE(char *) ap_strstr(char *s, const char *c)
{
return strstr(s,c);
}
+
+#if defined(ap_strstr_c)
+#undef ap_strstr_c
+AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c);
+#endif
+
AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c)
{
return strstr(s,c);
}
+#if defined(ap_get_module_config)
+#undef ap_get_module_config
+AP_DECLARE(void *) ap_get_module_config(const ap_conf_vector_t *cv,
+ const module *m);
+#endif
AP_DECLARE(void *) ap_get_module_config(const ap_conf_vector_t *cv,
const module *m)
@@ -110,11 +157,14 @@
* @param val The module-specific data to set
* @deffunc void ap_set_module_config(ap_conf_vector_t *cv, const module *m, void *val)
*/
+#if defined(ap_set_module_config)
+#undef ap_set_module_config
+AP_DECLARE(void) ap_set_module_config(ap_conf_vector_t *cv, const module *m,
+ void *val);
+#endif
+
AP_DECLARE(void) ap_set_module_config(ap_conf_vector_t *cv, const module *m,
void *val)
{
((void **)cv)[m->module_index] = val;
}
-
-
-#endif /* AP_DEBUG */