Mailing List Archive

jim 98/05/03 10:31:16

Modified: . STATUS
src CHANGES
src/include alloc.h ap.h buff.h compat.h conf.h explain.h
fnmatch.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 util_uri.h
Log:
Submitted by: Michael Anderson's <mka@redes.int.com.mx>
Reviewed by: Jim Jagielski, Dean Gaudet, Ben Laurie
Apache header files, and some variable name/types, are more C++ friendly

Revision Changes Path
1.356 +1 -4 apache-1.3/STATUS

Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- STATUS 1998/05/03 17:16:56 1.355
+++ STATUS 1998/05/03 17:31:02 1.356
@@ -85,16 +85,13 @@
* Jim's fix for MIME type case sensitivity disparity, PR#2112
* Child processes can now "signal" to the parent process that
it (the parent process) should abort, shutting down the server.
+ * Michael Anderson's <mka@redes.int.com.mx> C++ friendly patch

Available Patches:

* Dean's mod_alias.c, translate_alias_redir patch
<Pine.LNX.3.96dg4.980502223053.15827H-100000@twinlark.arctic.org>
Status: Dean, Ben, Jim +1
-
- * Michael Anderson's <mka@redes.int.com.mx> C++ friendly patch
- <354A4183.3E9AF551@redes.int.com.mx>
- Status: Ben, Jim +1, Dean +1, Ralf +1

* Arnt Gulbrandsen <agulbra@troll.no> 03 Apr 1998 21:28:17 +0200
<m3emzer9gu.fsf@lupinella.troll.no> mod_usertrack.c patch:



1.812 +3 -0 apache-1.3/src/CHANGES

Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.811
retrieving revision 1.812
diff -u -r1.811 -r1.812
--- CHANGES 1998/05/03 17:16:57 1.811
+++ CHANGES 1998/05/03 17:31:02 1.812
@@ -1,5 +1,8 @@
Changes with Apache 1.3b7

+ *) Make Apache header files, and some variables, C++ friendly.
+ [Michael Anderson's <mka@redes.int.com.mx>]
+
*) Child processes can now "signal" (by exiting with a status
of APEXIT_CHILDFATAL) the parent process to abort and
shutdown the server if the error in the child process was



1.56 +10 -1 apache-1.3/src/include/alloc.h

Index: alloc.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/alloc.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- alloc.h 1998/04/11 12:00:18 1.55
+++ alloc.h 1998/05/03 17:31:06 1.56
@@ -58,6 +58,10 @@
#ifndef APACHE_ALLOC_H
#define APACHE_ALLOC_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* Resource allocation routines...
*
@@ -85,6 +89,7 @@
#endif

typedef struct pool pool;
+typedef struct pool ap_pool;

pool * ap_init_alloc(void); /* Set up everything */
API_EXPORT(pool *) ap_make_sub_pool(pool *); /* All pools are subpools of permanent_pool */
@@ -131,7 +136,7 @@
*/

typedef struct {
- pool *pool;
+ ap_pool *pool;
int elt_size;
int nelts;
int nalloc;
@@ -310,5 +315,9 @@

API_EXPORT(long) ap_bytes_in_pool(pool *p);
API_EXPORT(long) ap_bytes_in_free_blocks(void);
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_ALLOC_H */



1.13 +8 -0 apache-1.3/src/include/ap.h

Index: ap.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/ap.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ap.h 1998/04/19 19:19:37 1.12
+++ ap.h 1998/05/03 17:31:06 1.13
@@ -61,6 +61,10 @@
#ifndef APACHE_AP_H
#define APACHE_AP_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
API_EXPORT(char *) ap_cpystrn(char *, const char *, size_t);
int ap_slack(int, int);
API_EXPORT(char *) ap_escape_quotes(pool *, const char *);
@@ -146,5 +150,9 @@
__attribute__((format(printf,3,4)));
API_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format,
va_list ap);
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_AP_H */



1.39 +9 -1 apache-1.3/src/include/buff.h

Index: buff.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/buff.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- buff.h 1998/04/27 06:59:33 1.38
+++ buff.h 1998/05/03 17:31:07 1.39
@@ -58,6 +58,10 @@
#ifndef APACHE_BUFF_H
#define APACHE_BUFF_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifdef B_SFIO
#include "sfio.h"
#endif
@@ -108,7 +112,7 @@
void *error_data;
long int bytes_sent; /* number of bytes actually written */

- pool *pool;
+ ap_pool *pool;

/* could also put pointers to the basic I/O routines here */
int fd; /* the file descriptor */
@@ -198,5 +202,9 @@

/* bflush() if a read now would block, but don't actually read anything */
API_EXPORT(void) ap_bhalfduplex(BUFF *fb);
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_BUFF_H */



1.5 +8 -0 apache-1.3/src/include/compat.h

Index: compat.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/compat.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- compat.h 1998/04/27 06:59:33 1.4
+++ compat.h 1998/05/03 17:31:07 1.5
@@ -8,6 +8,10 @@
#ifndef APACHE_COMPAT_H
#define APACHE_COMPAT_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* Mapping of Apache 1.2 global symbols to the
* namespace conflict free variants used in Apache 1.3
@@ -397,5 +401,9 @@
#define util_uri_init ap_util_uri_init
#define uudecode ap_uudecode
#define vbprintf ap_vbprintf
+
+#ifdef __cplusplus
+}
+#endif

#endif /* APACHE_COMPAT_H */



1.207 +8 -0 apache-1.3/src/include/conf.h

Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- conf.h 1998/05/02 11:15:10 1.206
+++ conf.h 1998/05/03 17:31:07 1.207
@@ -58,6 +58,10 @@
#ifndef APACHE_CONF_H
#define APACHE_CONF_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* conf.h: system-dependant #defines and includes...
* See PORTING for a listing of what they mean
@@ -1144,6 +1148,10 @@
#endif
#ifdef NEED_DIFFTIME
extern double difftime(time_t time1, time_t time0);
+#endif
+
+#ifdef __cplusplus
+}
#endif

#endif /* !APACHE_CONF_H */



1.8 +9 -0 apache-1.3/src/include/explain.h

Index: explain.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/explain.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- explain.h 1998/04/11 12:00:19 1.7
+++ explain.h 1998/05/03 17:31:07 1.8
@@ -1,3 +1,8 @@
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef EXPLAIN
#define DEF_Explain
#define Explain0(f)
@@ -32,4 +37,8 @@
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \
f,a1,a2,a3,a4,a5,a6)

+#endif
+
+#ifdef __cplusplus
+}
#endif



1.5 +8 -0 apache-1.3/src/include/fnmatch.h

Index: fnmatch.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/fnmatch.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fnmatch.h 1998/04/11 12:00:19 1.4
+++ fnmatch.h 1998/05/03 17:31:08 1.5
@@ -40,6 +40,10 @@
#ifndef _FNMATCH_H_
#define _FNMATCH_H_

+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define FNM_NOMATCH 1 /* Match failed. */

#define FNM_NOESCAPE 0x01 /* Disable backslash escaping. */
@@ -50,5 +54,9 @@

/* this function is an Apache addition */
API_EXPORT(extern int) ap_is_fnmatch(const char *);
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !_FNMATCH_H_ */



1.29 +8 -0 apache-1.3/src/include/http_conf_globals.h

Index: http_conf_globals.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_conf_globals.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- http_conf_globals.h 1998/04/19 20:10:44 1.28
+++ http_conf_globals.h 1998/05/03 17:31:08 1.29
@@ -58,6 +58,10 @@
#ifndef APACHE_HTTP_CONF_GLOBALS_H
#define APACHE_HTTP_CONF_GLOBALS_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* Process config --- what the process ITSELF is doing
*/
@@ -104,5 +108,9 @@
* is some memory corruption, so we allocate it statically.
*/
extern char ap_coredump_dir[MAX_STRING_LEN];
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_HTTP_CONF_GLOBALS_H */



1.81 +9 -1 apache-1.3/src/include/http_config.h

Index: http_config.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- http_config.h 1998/04/13 18:11:51 1.80
+++ http_config.h 1998/05/03 17:31:08 1.81
@@ -58,6 +58,10 @@
#ifndef APACHE_HTTP_CONFIG_H
#define APACHE_HTTP_CONFIG_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* The central data structures around here...
*/
@@ -149,7 +153,7 @@

configfile_t *config_file; /* Config file structure from pcfg_openfile() */

- pool *pool; /* Pool to allocate new storage in */
+ ap_pool *pool; /* Pool to allocate new storage in */
struct pool *temp_pool; /* Pool for scratch memory; persists during
* configuration, but wiped before the first
* request is served...
@@ -371,6 +375,10 @@
CORE_EXPORT(const command_rec *) ap_find_command_in_modules(const char *cmd_name, module **mod);
CORE_EXPORT(const char *) ap_handle_command(cmd_parms *parms, void *config, const char *l);

+#endif
+
+#ifdef __cplusplus
+}
#endif

#endif /* !APACHE_HTTP_CONFIG_H */



1.43 +8 -0 apache-1.3/src/include/http_core.h

Index: http_core.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_core.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- http_core.h 1998/04/11 12:00:19 1.42
+++ http_core.h 1998/05/03 17:31:08 1.43
@@ -58,6 +58,10 @@
#ifndef APACHE_HTTP_CORE_H
#define APACHE_HTTP_CORE_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*****************************************************************
*
* The most basic server code is encapsulated in a single module
@@ -248,6 +252,10 @@
CORE_EXPORT(void) ap_add_per_url_conf (server_rec *s, void *url_config);
CORE_EXPORT_NONSTD(const char *) ap_limit_section (cmd_parms *cmd, void *dummy, const char *arg);

+#endif
+
+#ifdef __cplusplus
+}
#endif

#endif /* !APACHE_HTTP_CORE_H */



1.30 +8 -0 apache-1.3/src/include/http_log.h

Index: http_log.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_log.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- http_log.h 1998/04/27 06:59:34 1.29
+++ http_log.h 1998/05/03 17:31:08 1.30
@@ -58,6 +58,10 @@
#ifndef APACHE_HTTP_LOG_H
#define APACHE_HTTP_LOG_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifdef HAVE_SYSLOG
#include <syslog.h>

@@ -134,6 +138,10 @@
#else
#define ap_piped_log_read_fd(pl) (-1)
#define ap_piped_log_write_fd(pl) (fileno((pl)->write_f))
+#endif
+
+#ifdef __cplusplus
+}
#endif

#endif /* !APACHE_HTTP_LOG_H */



1.29 +8 -0 apache-1.3/src/include/http_main.h

Index: http_main.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_main.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- http_main.h 1998/04/11 12:00:20 1.28
+++ http_main.h 1998/05/03 17:31:09 1.29
@@ -58,6 +58,10 @@
#ifndef APACHE_HTTP_MAIN_H
#define APACHE_HTTP_MAIN_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* Routines in http_main.c which other code --- in particular modules ---
* may want to call. Right now, that's limited to timeout handling.
@@ -161,6 +165,10 @@
*/
API_EXPORT(void) ap_unregister_other_child(void *data);

+#endif
+
+#ifdef __cplusplus
+}
#endif

#endif /* !APACHE_HTTP_MAIN_H */



1.42 +8 -0 apache-1.3/src/include/http_protocol.h

Index: http_protocol.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_protocol.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- http_protocol.h 1998/04/11 12:00:22 1.41
+++ http_protocol.h 1998/05/03 17:31:09 1.42
@@ -58,6 +58,10 @@
#ifndef APACHE_HTTP_PROTOCOL_H
#define APACHE_HTTP_PROTOCOL_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* Prototypes for routines which either talk directly back to the user,
* or control the ones that eventually do.
@@ -204,5 +208,9 @@
/* This is also useful for putting sub_reqs and internal_redirects together */

CORE_EXPORT(void) ap_parse_uri(request_rec *r, const char *uri);
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_HTTP_PROTOCOL_H */



1.24 +8 -0 apache-1.3/src/include/http_request.h

Index: http_request.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_request.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- http_request.h 1998/04/11 12:00:22 1.23
+++ http_request.h 1998/05/03 17:31:09 1.24
@@ -58,6 +58,10 @@
#ifndef APACHE_HTTP_REQUEST_H
#define APACHE_HTTP_REQUEST_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* 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-
* directory configuration, building it if necessary, and calling all
@@ -101,6 +105,10 @@
/* Function called by main.c to handle first-level request */
void ap_process_request(request_rec *);
void ap_die(int type, request_rec *r);
+#endif
+
+#ifdef __cplusplus
+}
#endif

#endif /* !APACHE_HTTP_REQUEST_H */



1.9 +8 -0 apache-1.3/src/include/http_vhost.h

Index: http_vhost.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_vhost.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- http_vhost.h 1998/04/11 12:00:22 1.8
+++ http_vhost.h 1998/05/03 17:31:09 1.9
@@ -58,6 +58,10 @@
#ifndef APACHE_HTTP_VHOST_H
#define APACHE_HTTP_VHOST_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* called before any config is read */
void ap_init_vhost_config(pool *p);

@@ -83,5 +87,9 @@
*/
API_EXPORT(int) ap_matches_request_vhost(request_rec *r, const char *host,
unsigned port);
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_HTTP_VHOST_H */



1.208 +10 -2 apache-1.3/src/include/httpd.h

Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- httpd.h 1998/05/03 17:16:58 1.207
+++ httpd.h 1998/05/03 17:31:09 1.208
@@ -58,6 +58,10 @@
#ifndef APACHE_HTTPD_H
#define APACHE_HTTPD_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* httpd.h: header for simple (ha! not anymore) http daemon
*/
@@ -571,7 +575,7 @@

struct request_rec {

- pool *pool;
+ ap_pool *pool;
conn_rec *connection;
server_rec *server;

@@ -717,7 +721,7 @@

struct conn_rec {

- pool *pool;
+ ap_pool *pool;
server_rec *server;
server_rec *base_server; /* Physical vhost this conn come in on */
void *vhost_lookup_data; /* used by http_vhost.c */
@@ -1022,5 +1026,9 @@
#undef strtoul
#endif
#define strtoul strtoul_is_not_a_portable_function_use_strtol_instead
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_HTTPD_H */



1.14 +8 -0 apache-1.3/src/include/md5.h

Index: md5.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/md5.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- md5.h 1998/04/11 12:00:23 1.13
+++ md5.h 1998/05/03 17:31:10 1.14
@@ -88,6 +88,10 @@
#ifndef APACHE_MD5_H
#define APACHE_MD5_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* MD5.H - header file for MD5C.C */

/* UINT4 defines a four byte word */
@@ -104,5 +108,9 @@
API_EXPORT(void) ap_MD5Update(AP_MD5_CTX * context, const unsigned char *input,
unsigned int inputLen);
API_EXPORT(void) ap_MD5Final(unsigned char digest[16], AP_MD5_CTX * context);
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_MD5_H */



1.11 +8 -0 apache-1.3/src/include/multithread.h

Index: multithread.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/multithread.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- multithread.h 1998/04/11 12:00:23 1.10
+++ multithread.h 1998/05/03 17:31:10 1.11
@@ -1,6 +1,10 @@
#ifndef APACHE_MULTITHREAD_H
#define APACHE_MULTITHREAD_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define MULTI_OK (0)
#define MULTI_TIMEOUT (1)
#define MULTI_ERR (2)
@@ -53,5 +57,9 @@
#define ap_destroy_mutex(mutex_id) (0)

#endif /* ndef MULTITHREAD */
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_MULTITHREAD_H */



1.11 +8 -0 apache-1.3/src/include/rfc1413.h

Index: rfc1413.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/rfc1413.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rfc1413.h 1998/04/11 12:00:23 1.10
+++ rfc1413.h 1998/05/03 17:31:10 1.11
@@ -58,6 +58,14 @@
#ifndef APACHE_RFC1413_H
#define APACHE_RFC1413_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
extern char *ap_rfc1413(conn_rec *conn, server_rec *srv);
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_RFC1413_H */



1.40 +8 -0 apache-1.3/src/include/scoreboard.h

Index: scoreboard.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/scoreboard.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- scoreboard.h 1998/04/11 12:00:23 1.39
+++ scoreboard.h 1998/05/03 17:31:10 1.40
@@ -58,6 +58,10 @@
#ifndef APACHE_SCOREBOARD_H
#define APACHE_SCOREBOARD_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef WIN32
#include <sys/times.h>
#endif
@@ -161,5 +165,9 @@
/* for time_process_request() in http_main.c */
#define START_PREQUEST 1
#define STOP_PREQUEST 2
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_SCOREBOARD_H */



1.13 +8 -0 apache-1.3/src/include/util_date.h

Index: util_date.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/util_date.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- util_date.h 1998/04/11 12:00:23 1.12
+++ util_date.h 1998/05/03 17:31:11 1.13
@@ -58,6 +58,10 @@
#ifndef APACHE_UTIL_DATE_H
#define APAcHE_UTIL_DATE_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
/*
* util_date.h: prototypes for date parsing utility routines
*/
@@ -73,5 +77,9 @@
API_EXPORT(int) ap_checkmask(const char *data, const char *mask);
API_EXPORT(time_t) ap_tm2sec(const struct tm *t);
API_EXPORT(time_t) ap_parseHTTPdate(const char *date);
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_UTIL_DATE_H */



1.14 +8 -0 apache-1.3/src/include/util_md5.h

Index: util_md5.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/util_md5.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- util_md5.h 1998/03/31 12:52:31 1.13
+++ util_md5.h 1998/05/03 17:31:11 1.14
@@ -58,10 +58,18 @@
#ifndef APACHE_UTIL_MD5_H
#define APACHE_UTIL_MD5_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include "md5.h"

API_EXPORT(char *) ap_md5(pool *a, unsigned char *string);
API_EXPORT(char *) ap_md5contextTo64(pool *p, AP_MD5_CTX * context);
API_EXPORT(char *) ap_md5digest(pool *p, FILE *infile);
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_UTIL_MD5_H */



1.31 +8 -0 apache-1.3/src/include/util_script.h

Index: util_script.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/util_script.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- util_script.h 1998/04/11 12:00:23 1.30
+++ util_script.h 1998/05/03 17:31:11 1.31
@@ -58,6 +58,10 @@
#ifndef APACHE_UTIL_SCRIPT_H
#define APACHE_UTIL_SCRIPT_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef APACHE_ARG_MAX
#ifdef _POSIX_ARG_MAX
#define APACHE_ARG_MAX _POSIX_ARG_MAX
@@ -77,5 +81,9 @@
API_EXPORT(void) ap_send_size(size_t size, request_rec *r);
API_EXPORT(int) ap_call_exec(request_rec *r, char *argv0, char **env,
int shellcmd);
+
+#ifdef __cplusplus
+}
+#endif

#endif /* !APACHE_UTIL_SCRIPT_H */



1.8 +8 -0 apache-1.3/src/include/util_uri.h

Index: util_uri.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/util_uri.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- util_uri.h 1998/04/11 12:00:24 1.7
+++ util_uri.h 1998/05/03 17:31:11 1.8
@@ -61,6 +61,10 @@
#ifndef UTIL_URI_H
#define UTIL_URI_H

+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef struct {
const char *name;
unsigned short default_port;
@@ -115,5 +119,9 @@
API_EXPORT(int) ap_parse_hostinfo_components(pool *p, const char *hostinfo, uri_components *uptr);
/* called by the core in main() */
extern void ap_util_uri_init(void);
+
+#ifdef __cplusplus
+}
+#endif

#endif /*UTIL_URI_H*/