Clean up some of the includes:

- explicitly include apr_lib.h since ap_config.h doesn't
- use apr_want.h where possible
- use APR_HAVE_ where possible
- remove some unneeded includes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88060 13f79535-47bb-0310-9956-ffa450edef68

server/util_debug.c

@@ -56,31 +56,46 @@
  * University of Illinois, Urbana-Champaign.
  */
 
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
 #include "httpd.h"
 
 #ifdef AP_DEBUG
 # undef strchr
 
 char *ap_strchr(char *s, int c)
-{ return strchr(s,c); }
+{
+    return strchr(s,c);
+}
 
 const char *ap_strchr_c(const char *s, int c)
-{ return strchr(s,c); }
+{
+    return strchr(s,c);
+}
 
 # undef strrchr
 
 char *ap_strrchr(char *s, int c)
-{ return strrchr(s,c); }
+{
+    return strrchr(s,c);
+}
 
 const char *ap_strrchr_c(const char *s, int c)
-{ return strrchr(s,c); }
+{
+    return strrchr(s,c);
+}
 
 #undef strstr
 
 char *ap_strstr(char *s, char *c)
-{ return strstr(s,c); }
+{
+    return strstr(s,c);
+}
 
 const char *ap_strstr_c(const char *s, const char *c)
-{ return strstr(s,c); }
+{
+    return strstr(s,c);
+}
 
-#endif
+#endif /* AP_DEBUG */