coar 98/01/21 11:17:52
Modified: src/ap ap.h
src/main alloc.h buff.h conf.h http_conf_globals.h
http_config.h http_core.h http_log.h http_main.h
http_protocol.h http_request.h http_vhost.h httpd.h
md5.h multithread.h rfc1413.h scoreboard.h
util_date.h util_md5.h util_script.h
Log:
Change those just-added #ifndefs to *not* use a leading underbar.
(Marc's suggestion.)
Revision Changes Path
1.3 +3 -3 apachen/src/ap/ap.h
Index: ap.h
===================================================================
RCS file: /export/home/cvs/apachen/src/ap/ap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap.h 1998/01/21 18:23:46 1.2
+++ ap.h 1998/01/21 19:17:34 1.3
@@ -54,8 +54,8 @@
* <[EMAIL PROTECTED]> for xinetd.
*/
-#ifndef _APACHE_AP_H
-#define _APACHE_AP_H
+#ifndef APACHE_AP_H
+#define APACHE_AP_H
API_EXPORT(char *) ap_cpystrn(char *, const char *, size_t);
int ap_slack(int, int);
@@ -63,4 +63,4 @@
API_EXPORT(int) ap_snprintf(char *, size_t, const char *, ...);
API_EXPORT(int) ap_vsnprintf(char *, size_t, const char *, va_list ap);
-#endif /* !_APACHE_AP_H */
+#endif /* !APACHE_AP_H */
1.40 +3 -4 apachen/src/main/alloc.h
Index: alloc.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/alloc.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- alloc.h 1998/01/21 18:23:47 1.39
+++ alloc.h 1998/01/21 19:17:35 1.40
@@ -1,4 +1,3 @@
-
/* ====================================================================
* Copyright (c) 1995-1998 The Apache Group. All rights reserved.
*
@@ -52,8 +51,8 @@
*
*/
-#ifndef _APACHE_ALLOC_H
-#define _APACHE_ALLOC_H
+#ifndef APACHE_ALLOC_H
+#define APACHE_ALLOC_H
/*
* Resource allocation routines...
@@ -280,4 +279,4 @@
API_EXPORT(long) bytes_in_pool(pool *p);
API_EXPORT(long) bytes_in_free_blocks(void);
-#endif /* !_APACHE_ALLOC_H */
+#endif /* !APACHE_ALLOC_H */
1.32 +3 -3 apachen/src/main/buff.h
Index: buff.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/buff.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- buff.h 1998/01/21 18:23:47 1.31
+++ buff.h 1998/01/21 19:17:35 1.32
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_BUFF_H
-#define _APACHE_BUFF_H
+#ifndef APACHE_BUFF_H
+#define APACHE_BUFF_H
#ifdef B_SFIO
#include "sfio.h"
@@ -193,4 +193,4 @@
/* bflush() if a read now would block, but don't actually read anything */
API_EXPORT(void) bhalfduplex(BUFF *fb);
-#endif /* !_APACHE_BUFF_H */
+#endif /* !APACHE_BUFF_H */
1.168 +3 -3 apachen/src/main/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/conf.h,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- conf.h 1998/01/21 18:23:48 1.167
+++ conf.h 1998/01/21 19:17:36 1.168
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_CONF_H
-#define _APACHE_CONF_H
+#ifndef APACHE_CONF_H
+#define APACHE_CONF_H
/*
* conf.h: system-dependant #defines and includes...
@@ -1051,4 +1051,4 @@
extern double difftime(time_t time1, time_t time0);
#endif
-#endif /* !_APACHE_CONF_H */
+#endif /* !APACHE_CONF_H */
1.24 +3 -3 apachen/src/main/http_conf_globals.h
Index: http_conf_globals.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_conf_globals.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- http_conf_globals.h 1998/01/21 18:23:48 1.23
+++ http_conf_globals.h 1998/01/21 19:17:36 1.24
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_HTTP_CONF_GLOBALS_H
-#define _APACHE_HTTP_CONF_GLOBALS_H
+#ifndef APACHE_HTTP_CONF_GLOBALS_H
+#define APACHE_HTTP_CONF_GLOBALS_H
/*
* Process config --- what the process ITSELF is doing
@@ -100,4 +100,4 @@
*/
extern char coredump_dir[MAX_STRING_LEN];
-#endif /* !_APACHE_HTTP_CONF_GLOBALS_H */
+#endif /* !APACHE_HTTP_CONF_GLOBALS_H */
1.61 +3 -3 apachen/src/main/http_config.h
Index: http_config.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_config.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- http_config.h 1998/01/21 18:23:49 1.60
+++ http_config.h 1998/01/21 19:17:37 1.61
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_HTTP_CONFIG_H
-#define _APACHE_HTTP_CONFIG_H
+#ifndef APACHE_HTTP_CONFIG_H
+#define APACHE_HTTP_CONFIG_H
/*
* The central data structures around here...
@@ -334,4 +334,4 @@
#endif
-#endif /* !_APACHE_HTTP_CONFIG_H */
+#endif /* !APACHE_HTTP_CONFIG_H */
1.32 +3 -3 apachen/src/main/http_core.h
Index: http_core.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_core.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- http_core.h 1998/01/21 18:23:50 1.31
+++ http_core.h 1998/01/21 19:17:37 1.32
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_HTTP_CORE_H
-#define _APACHE_HTTP_CORE_H
+#ifndef APACHE_HTTP_CORE_H
+#define APACHE_HTTP_CORE_H
/*****************************************************************
*
@@ -221,4 +221,4 @@
#endif
-#endif /* !_APACHE_HTTP_CORE_H */
+#endif /* !APACHE_HTTP_CORE_H */
1.25 +3 -3 apachen/src/main/http_log.h
Index: http_log.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_log.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- http_log.h 1998/01/21 18:23:51 1.24
+++ http_log.h 1998/01/21 19:17:38 1.25
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_HTTP_LOG_H
-#define _APACHE_HTTP_LOG_H
+#ifndef APACHE_HTTP_LOG_H
+#define APACHE_HTTP_LOG_H
#ifdef HAVE_SYSLOG
#include <syslog.h>
@@ -132,4 +132,4 @@
#define piped_log_write_fd(pl) (fileno((pl)->write_f))
#endif
-#endif /* !_APACHE_HTTP_LOG_H */
+#endif /* !APACHE_HTTP_LOG_H */
1.24 +3 -3 apachen/src/main/http_main.h
Index: http_main.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_main.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- http_main.h 1998/01/21 18:23:51 1.23
+++ http_main.h 1998/01/21 19:17:38 1.24
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_HTTP_MAIN_H
-#define _APACHE_HTTP_MAIN_H
+#ifndef APACHE_HTTP_MAIN_H
+#define APACHE_HTTP_MAIN_H
/*
* Routines in http_main.c which other code --- in particular modules ---
@@ -144,4 +144,4 @@
#endif
-#endif /* !_APACHE_HTTP_MAIN_H */
+#endif /* !APACHE_HTTP_MAIN_H */
1.34 +3 -3 apachen/src/main/http_protocol.h
Index: http_protocol.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_protocol.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- http_protocol.h 1998/01/21 18:23:52 1.33
+++ http_protocol.h 1998/01/21 19:17:39 1.34
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_HTTP_PROTOCOL_H
-#define _APACHE_HTTP_PROTOCOL_H
+#ifndef APACHE_HTTP_PROTOCOL_H
+#define APACHE_HTTP_PROTOCOL_H
/*
* Prototypes for routines which either talk directly back to the user,
@@ -204,4 +204,4 @@
void parse_uri(request_rec *r, const char *uri);
-#endif /* !_APACHE_HTTP_PROTOCOL_H */
+#endif /* !APACHE_HTTP_PROTOCOL_H */
1.20 +3 -3 apachen/src/main/http_request.h
Index: http_request.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_request.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- http_request.h 1998/01/21 18:23:52 1.19
+++ http_request.h 1998/01/21 19:17:39 1.20
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_HTTP_REQUEST_H
-#define _APACHE_HTTP_REQUEST_H
+#ifndef APACHE_HTTP_REQUEST_H
+#define APACHE_HTTP_REQUEST_H
/* http_request.c is the code which handles the main line of request
* processing, once a request has been read in (finding the right per-
@@ -100,4 +100,4 @@
void die(int type, request_rec *r);
#endif
-#endif /* !_APACHE_HTTP_REQUEST_H */
+#endif /* !APACHE_HTTP_REQUEST_H */
1.5 +3 -3 apachen/src/main/http_vhost.h
Index: http_vhost.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_vhost.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- http_vhost.h 1998/01/21 18:23:53 1.4
+++ http_vhost.h 1998/01/21 19:17:40 1.5
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_HTTP_VHOST_H
-#define _APACHE_HTTP_VHOST_H
+#ifndef APACHE_HTTP_VHOST_H
+#define APACHE_HTTP_VHOST_H
/* called before any config is read */
void init_vhost_config(pool *p);
@@ -74,4 +74,4 @@
*/
void update_vhost_from_headers(request_rec *r);
-#endif /* !_APACHE_HTTP_VHOST_H */
+#endif /* !APACHE_HTTP_VHOST_H */
1.174 +3 -3 apachen/src/main/httpd.h
Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- httpd.h 1998/01/21 18:23:53 1.173
+++ httpd.h 1998/01/21 19:17:40 1.174
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_HTTPD_H
-#define _APACHE_HTTPD_H
+#ifndef APACHE_HTTPD_H
+#define APACHE_HTTPD_H
/*
* httpd.h: header for simple (ha! not anymore) http daemon
@@ -946,4 +946,4 @@
#define RAISE_SIGSTOP(x)
#endif
-#endif /* !_APACHE_HTTPD_H */
+#endif /* !APACHE_HTTPD_H */
1.11 +3 -3 apachen/src/main/md5.h
Index: md5.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/md5.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- md5.h 1998/01/21 18:23:54 1.10
+++ md5.h 1998/01/21 19:17:41 1.11
@@ -81,8 +81,8 @@
*
*/
-#ifndef _APACHE_MD5_H
-#define _APACHE_MD5_H
+#ifndef APACHE_MD5_H
+#define APACHE_MD5_H
/* MD5.H - header file for MD5C.C */
@@ -101,4 +101,4 @@
unsigned int inputLen);
API_EXPORT(void) MD5Final(unsigned char digest[16], AP_MD5_CTX * context);
-#endif /* !_APACHE_MD5_H */
+#endif /* !APACHE_MD5_H */
1.9 +3 -3 apachen/src/main/multithread.h
Index: multithread.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/multithread.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- multithread.h 1998/01/21 18:23:54 1.8
+++ multithread.h 1998/01/21 19:17:42 1.9
@@ -1,5 +1,5 @@
-#ifndef _APACHE_MULTITHREAD_H
-#define _APACHE_MULTITHREAD_H
+#ifndef APACHE_MULTITHREAD_H
+#define APACHE_MULTITHREAD_H
#define MULTI_OK (0)
#define MULTI_TIMEOUT (1)
@@ -54,4 +54,4 @@
#endif /* ndef MULTITHREAD */
-#endif /* !_APACHE_MULTITHREAD_H */
+#endif /* !APACHE_MULTITHREAD_H */
1.8 +3 -3 apachen/src/main/rfc1413.h
Index: rfc1413.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/rfc1413.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rfc1413.h 1998/01/21 18:23:55 1.7
+++ rfc1413.h 1998/01/21 19:17:43 1.8
@@ -51,9 +51,9 @@
*
*/
-#ifndef _APACHE_RFC1413_H
-#define _APACHE_RFC1413_H
+#ifndef APACHE_RFC1413_H
+#define APACHE_RFC1413_H
extern char *rfc1413(conn_rec *conn, server_rec *srv);
-#endif /* !_APACHE_RFC1413_H */
+#endif /* !APACHE_RFC1413_H */
1.36 +3 -3 apachen/src/main/scoreboard.h
Index: scoreboard.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/scoreboard.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- scoreboard.h 1998/01/21 18:23:55 1.35
+++ scoreboard.h 1998/01/21 19:17:44 1.36
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_SCOREBOARD_H
-#define _APACHE_SCOREBOARD_H
+#ifndef APACHE_SCOREBOARD_H
+#define APACHE_SCOREBOARD_H
#ifndef WIN32
#include <sys/times.h>
@@ -159,4 +159,4 @@
#define START_PREQUEST 1
#define STOP_PREQUEST 2
-#endif /* !_APACHE_SCOREBOARD_H */
+#endif /* !APACHE_SCOREBOARD_H */
1.9 +3 -3 apachen/src/main/util_date.h
Index: util_date.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/util_date.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- util_date.h 1998/01/21 18:23:56 1.8
+++ util_date.h 1998/01/21 19:17:44 1.9
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_UTIL_DATE_H
-#define _APAcHE_UTIL_DATE_H
+#ifndef APACHE_UTIL_DATE_H
+#define APAcHE_UTIL_DATE_H
/*
* util_date.h: prototypes for date parsing utility routines
@@ -70,4 +70,4 @@
time_t tm2sec(const struct tm *t);
API_EXPORT(time_t) parseHTTPdate(const char *date);
-#endif /* !_APACHE_UTIL_DATE_H */
+#endif /* !APACHE_UTIL_DATE_H */
1.12 +3 -3 apachen/src/main/util_md5.h
Index: util_md5.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/util_md5.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- util_md5.h 1998/01/21 18:23:56 1.11
+++ util_md5.h 1998/01/21 19:17:45 1.12
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_UTIL_MD5_H
-#define _APACHE_UTIL_MD5_H
+#ifndef APACHE_UTIL_MD5_H
+#define APACHE_UTIL_MD5_H
#include "md5.h"
@@ -60,4 +60,4 @@
API_EXPORT(char *) ap_md5contextTo64(pool *p, AP_MD5_CTX * context);
API_EXPORT(char *) ap_md5digest(pool *p, FILE *infile);
-#endif /* !_APACHE_UTIL_MD5_H */
+#endif /* !APACHE_UTIL_MD5_H */
1.27 +3 -3 apachen/src/main/util_script.h
Index: util_script.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/util_script.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- util_script.h 1998/01/21 18:23:57 1.26
+++ util_script.h 1998/01/21 19:17:45 1.27
@@ -51,8 +51,8 @@
*
*/
-#ifndef _APACHE_UTIL_SCRIPT_H
-#define _APACHE_UTIL_SCRIPT_H
+#ifndef APACHE_UTIL_SCRIPT_H
+#define APACHE_UTIL_SCRIPT_H
#ifndef APACHE_ARG_MAX
#ifdef _POSIX_ARG_MAX
@@ -74,4 +74,4 @@
API_EXPORT(int) call_exec(request_rec *r, char *argv0, char **env,
int shellcmd);
-#endif /* !_APACHE_UTIL_SCRIPT_H */
+#endif /* !APACHE_UTIL_SCRIPT_H */
