diff options
| author | Greg Stein <gstein@apache.org> | 2001-02-10 14:05:29 +0100 |
|---|---|---|
| committer | Greg Stein <gstein@apache.org> | 2001-02-10 14:05:29 +0100 |
| commit | bb282b75f71256a00c110d39842e7bc3b83958a6 (patch) | |
| tree | 908e5f92600f65ed10a12d85a48849108233f1ed /modules/mappers/mod_rewrite.h | |
| parent | http_conf_globals.h is gone (diff) | |
| download | apache2-bb282b75f71256a00c110d39842e7bc3b83958a6.tar.xz apache2-bb282b75f71256a00c110d39842e7bc3b83958a6.zip | |
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
Diffstat (limited to 'modules/mappers/mod_rewrite.h')
| -rw-r--r-- | modules/mappers/mod_rewrite.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/modules/mappers/mod_rewrite.h b/modules/mappers/mod_rewrite.h index fd70d37873..cb2b1f4c12 100644 --- a/modules/mappers/mod_rewrite.h +++ b/modules/mappers/mod_rewrite.h @@ -56,8 +56,8 @@ * University of Illinois, Urbana-Champaign. */ -#ifndef _MOD_REWRITE_H -#define _MOD_REWRITE_H 1 +#ifndef MOD_REWRITE_H +#define MOD_REWRITE_H 1 /* ** _ _ _ @@ -92,29 +92,31 @@ ** www.engelschall.com */ +#include "apr.h" + +#define APR_WANT_STRFUNC +#define APR_WANT_MEMFUNC +#include "apr_want.h" /* Include from the underlaying Unix system ... */ -#ifdef HAVE_STRING_H -#include <string.h> -#endif -#ifdef APR_HAVE_STDARG_H +#if APR_HAVE_STDARG_H #include <stdarg.h> #endif -#ifdef HAVE_STDLIB_H +#if APR_HAVE_STDLIB_H #include <stdlib.h> #endif -#ifdef HAVE_TIME_H -#include <time.h> -#endif -#ifdef HAVE_CTYPE_H +#if APR_HAVE_CTYPE_H #include <ctype.h> #endif -#ifndef NETWARE +#if APR_HAVE_SYS_TYPES_H #include <sys/types.h> #endif -/* are these needed anymore? rbb */ -#include <signal.h> -#include <errno.h> + +#include "ap_config.h" + +#ifdef HAVE_TIME_H +#include <time.h> +#endif /* Include from the Apache server ... */ #define CORE_PRIVATE @@ -472,6 +474,4 @@ static int compare_lexicography(char *cpNum1, char *cpNum2); static char *find_closing_bracket(char *s, int left, int right); static char *find_char_in_brackets(char *s, int c, int left, int right); -#endif /* _MOD_REWRITE_H */ - -/*EOF*/ +#endif /* MOD_REWRITE_H */ |