From: William A. Rowe Jr <wrowe@apache.org>
Date: Sun, 20 Jan 2002 19:19:10 +0000 (+0000)
Subject:   Per W. Stoddard and Jim Js' request - revert to binary compatibility.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54a3e1b4f392c484070acb7d3decc500fbbecb6c;p=thirdparty%2Fapache%2Fhttpd.git

  Per W. Stoddard and Jim Js' request - revert to binary compatibility.

  These declarations are entirely wrong, of course, but we will trudge
  on with 1.3.23 sharing this brokenness with 1.3.22 and prior.

  Will be grepping and fixing in 2.0.31-dev, if similar problems exist.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@92947 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/ap/ap_snprintf.c b/src/ap/ap_snprintf.c
index a4c1ed3eec6..882a8135252 100644
--- a/src/ap/ap_snprintf.c
+++ b/src/ap/ap_snprintf.c
@@ -1171,7 +1171,7 @@ static int snprintf_flush(ap_vformatter_buff *vbuff)
 }
 
 
-API_EXPORT_NONSTD(int) ap_snprintf(char *buf, size_t len, const char *format,...)
+API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...)
 {
     int cc;
     va_list ap;
diff --git a/src/include/ap.h b/src/include/ap.h
index 829284d59bd..bf498002170 100644
--- a/src/include/ap.h
+++ b/src/include/ap.h
@@ -159,7 +159,7 @@ API_EXPORT(int) ap_vformatter(int (*flush_func)(ap_vformatter_buff *),
  * to distinguish between an output which was truncated, and an output which
  * exactly filled the buffer.
  */
-API_EXPORT_NONSTD(int) ap_snprintf(char *buf, size_t len, const char *format,...)
+API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...)
 			    __attribute__((format(printf,3,4)));
 API_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format,
 			     va_list ap);
diff --git a/src/include/ap_alloc.h b/src/include/ap_alloc.h
index 6954f6c3a32..2ec5e33e382 100644
--- a/src/include/ap_alloc.h
+++ b/src/include/ap_alloc.h
@@ -232,8 +232,8 @@ API_EXPORT(void) ap_table_mergen(table *, const char *name, const char *more_val
 API_EXPORT(void) ap_table_unset(table *, const char *key);
 API_EXPORT(void) ap_table_add(table *, const char *name, const char *val);
 API_EXPORT(void) ap_table_addn(table *, const char *name, const char *val);
-API_EXPORT_NONSTD(void) ap_table_do(int (*comp) (void *, const char *, const char *), 
-                                    void *rec, const table *t,...);
+API_EXPORT(void) ap_table_do(int (*comp) (void *, const char *, const char *), void *rec,
+			  const table *t,...);
 
 API_EXPORT(table *) ap_overlay_tables(pool *p, const table *overlay, const table *base);
 
diff --git a/src/include/buff.h b/src/include/buff.h
index c3272381c97..6a12b4e766c 100644
--- a/src/include/buff.h
+++ b/src/include/buff.h
@@ -172,7 +172,7 @@ API_EXPORT(int) ap_bskiplf(BUFF *fb);
 API_EXPORT(int) ap_bwrite(BUFF *fb, const void *buf, int nbyte);
 API_EXPORT(int) ap_bflush(BUFF *fb);
 API_EXPORT(int) ap_bputs(const char *x, BUFF *fb);
-API_EXPORT_NONSTD(int) ap_bvputs(BUFF *fb,...);
+API_EXPORT(int) ap_bvputs(BUFF *fb,...);
 API_EXPORT_NONSTD(int) ap_bprintf(BUFF *fb, const char *fmt,...)
 				__attribute__((format(printf,2,3)));
 API_EXPORT(int) ap_vbprintf(BUFF *fb, const char *fmt, va_list vlist);
diff --git a/src/include/http_log.h b/src/include/http_log.h
index 0e7a11d1334..e0fafbb7913 100644
--- a/src/include/http_log.h
+++ b/src/include/http_log.h
@@ -115,10 +115,10 @@ API_EXPORT(void) ap_open_logs (server_rec *, pool *p);
  * attack and other messy behavior.  Instead, use a simple format string
  * like "%s", followed by the string containing the untrusted data.
  */
-API_EXPORT_NONSTD(void) ap_log_error(const char *file, int line, int level,
+API_EXPORT(void) ap_log_error(const char *file, int line, int level,
 			     const server_rec *s, const char *fmt, ...)
 			    __attribute__((format(printf,5,6)));
-API_EXPORT_NONSTD(void) ap_log_rerror(const char *file, int line, int level,
+API_EXPORT(void) ap_log_rerror(const char *file, int line, int level,
 			     const request_rec *s, const char *fmt, ...)
 			    __attribute__((format(printf,5,6)));
 API_EXPORT(void) ap_error_log2stderr (server_rec *);     
@@ -130,7 +130,7 @@ API_EXPORT(void) ap_log_pid (pool *p, char *fname);
 API_EXPORT(void) ap_log_error_old(const char *err, server_rec *s);
 API_EXPORT(void) ap_log_unixerr(const char *routine, const char *file,
 			     const char *msg, server_rec *s);
-API_EXPORT_NONSTD(void) ap_log_printf(const server_rec *s, const char *fmt, ...)
+API_EXPORT(void) ap_log_printf(const server_rec *s, const char *fmt, ...)
 			    __attribute__((format(printf,2,3)));
 API_EXPORT(void) ap_log_reason(const char *reason, const char *fname,
 			    request_rec *r);
diff --git a/src/main/alloc.c b/src/main/alloc.c
index b31409d1a60..f6a6f7fc1c7 100644
--- a/src/main/alloc.c
+++ b/src/main/alloc.c
@@ -1480,8 +1480,8 @@ API_EXPORT(table *) ap_overlay_tables(pool *p, const table *overlay, const table
  * Note that rec is simply passed-on to the comp function, so that the
  * caller can pass additional info for the task.
  */
-API_EXPORT_NONSTD(void) ap_table_do(int (*comp) (void *, const char *, const char *), 
-	                            void *rec, const table *t,...)
+API_EXPORT(void) ap_table_do(int (*comp) (void *, const char *, const char *), void *rec,
+	      const table *t,...)
 {
     va_list vp;
     char *argp;
diff --git a/src/main/http_log.c b/src/main/http_log.c
index 82de525985b..df536b12674 100644
--- a/src/main/http_log.c
+++ b/src/main/http_log.c
@@ -472,7 +472,7 @@ static void log_error_core(const char *file, int line, int level,
 #endif
 }
     
-API_EXPORT_NONSTD(void) ap_log_error(const char *file, int line, int level,
+API_EXPORT(void) ap_log_error(const char *file, int line, int level,
 			      const server_rec *s, const char *fmt, ...)
 {
     va_list args;
@@ -482,7 +482,7 @@ API_EXPORT_NONSTD(void) ap_log_error(const char *file, int line, int level,
     va_end(args);
 }
 
-API_EXPORT_NONSTD(void) ap_log_rerror(const char *file, int line, int level,
+API_EXPORT(void) ap_log_rerror(const char *file, int line, int level,
 			       const request_rec *r, const char *fmt, ...)
 {
     va_list args;
@@ -567,7 +567,7 @@ API_EXPORT(void) ap_log_unixerr(const char *routine, const char *file,
     ap_log_error(file, 0, APLOG_ERR, s, "%s", msg);
 }
 
-API_EXPORT_NONSTD(void) ap_log_printf(const server_rec *s, const char *fmt, ...)
+API_EXPORT(void) ap_log_printf(const server_rec *s, const char *fmt, ...)
 {
     va_list args;
     
diff --git a/src/main/http_protocol.c b/src/main/http_protocol.c
index 384536319a0..62a18fe5740 100644
--- a/src/main/http_protocol.c
+++ b/src/main/http_protocol.c
@@ -2567,7 +2567,7 @@ API_EXPORT(int) ap_vrprintf(request_rec *r, const char *fmt, va_list ap)
     return n;
 }
 
-API_EXPORT_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt,...)
+API_EXPORT(int) ap_rprintf(request_rec *r, const char *fmt,...)
 {
     va_list vlist;
     int n;