Fix some errors from a global search and replace gone wrong. This should

let the new context changes work on all platforms.

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

diff --git a/os/beos/os.c b/os/beos/os.c
index 0eb63fc5f966b534e3b4003bb9e4c41eda04e5fa..72281c296eb83772c4b6ec9e93797768539273ee 100644 (file)
--- a/os/beos/os.c
+++ b/os/beos/os.c
@@ -1,6 +1,6 @@
 /*
  * This file will include OS specific functions which are not inlineable.
- * Any inlineable functions should be defined in os ap_context_t nline.c instead.
+ * Any inlineable functions should be defined in os-inline.c instead.
  */
 
 #include "ap_config.h"

diff --git a/os/beos/os.h b/os/beos/os.h
index 57a2ad1e44a7cb3bffa4bf3394981f19071c1876..a4af416269fe073cfb60783f9a08db6927ce6321 100644 (file)
--- a/os/beos/os.h
+++ b/os/beos/os.h
@@ -68,7 +68,7 @@
 /*
  * This file in included in all Apache source code. It contains definitions
  * of facilities available on _this_ operating system (HAVE_* macros),
- * and prototypes of OS specific functions defined in os.c or os ap_context_t nline.c
+ * and prototypes of OS specific functions defined in os.c or os-inline.c
  */
 
 extern int ap_os_is_path_absolute(const char *file);

diff --git a/os/bs2000/os.c b/os/bs2000/os.c
index 942a06aa7f55f63f0be4a99d68b12587113c2f35..c33810a2f0dca100e92117c4ee125de88b421965 100644 (file)
--- a/os/bs2000/os.c
+++ b/os/bs2000/os.c
@@ -57,7 +57,7 @@
 
 /*
  * This file will include OS specific functions which are not inlineable.
- * Any inlineable functions should be defined in os ap_context_t nline.c instead.
+ * Any inlineable functions should be defined in os-inline.c instead.
  */
 
 #include "httpd.h"

diff --git a/os/bs2000/os.h b/os/bs2000/os.h
index fb66b6155e5326c05b77d278db658deafcfbe4b5..1ede0813f2ef6a3526092b1e51e3e4ebd1d64d7a 100644 (file)
--- a/os/bs2000/os.h
+++ b/os/bs2000/os.h
@@ -6,7 +6,7 @@
 /*
  * This file in included in all Apache source code. It contains definitions
  * of facilities available on _this_ operating system (HAVE_* macros),
- * and prototypes of OS specific functions defined in os.c or os ap_context_t nline.c
+ * and prototypes of OS specific functions defined in os.c or os-inline.c
  */
 
 #if !defined(INLINE) && defined(USE_GNU_INLINE)
@@ -17,7 +17,7 @@
 
 INLINE int ap_os_is_path_absolute(const char *file);
 
-#include "os ap_context_t nline.c"
+#include "os-inline.c"
 #endif
 
 #ifndef INLINE

diff --git a/os/os2/os.h b/os/os2/os.h
index dbca54b217a500ff5c21bf8402483d3dd1231af5..d717f1f8ca4cb0578c815ec76823fbcc9d15aa10 100644 (file)
--- a/os/os2/os.h
+++ b/os/os2/os.h
@@ -8,7 +8,7 @@
 /*
  * This file in included in all Apache source code. It contains definitions
  * of facilities available on _this_ operating system (HAVE_* macros),
- * and prototypes of OS specific functions defined in os.c or os ap_context_t nline.c
+ * and prototypes of OS specific functions defined in os.c or os-inline.c
  */
 
 #if defined(__GNUC__) && !defined(INLINE)
@@ -19,7 +19,7 @@
 
 INLINE int ap_os_is_path_absolute(const char *file);
 
-#include "os ap_context_t nline.c"
+#include "os-inline.c"
 #endif
 
 #ifndef INLINE

diff --git a/os/tpf/os.c b/os/tpf/os.c
index dabe414f0f79491da181f95681e7fd30e1b2bd1f..79e16dabd65389310cdf509f96ddcc9114c6c776 100644 (file)
--- a/os/tpf/os.c
+++ b/os/tpf/os.c
@@ -57,7 +57,7 @@
 
 /*
  * This file will include OS specific functions which are not inlineable.
- * Any inlineable functions should be defined in os ap_context_t nline.c instead.
+ * Any inlineable functions should be defined in os-inline.c instead.
  */
 
 #include "httpd.h"

diff --git a/os/tpf/os.h b/os/tpf/os.h
index 916ef109fe9d6c1ee63c02134f937640a73455b3..ff65322902940eb29e8f010a23bec70af6a02f0b 100644 (file)
--- a/os/tpf/os.h
+++ b/os/tpf/os.h
@@ -10,7 +10,7 @@
 /*
  * This file in included in all Apache source code. It contains definitions
  * of facilities available on _this_ operating system (HAVE_* macros),
- * and prototypes of OS specific functions defined in os.c or os ap_context_t nline.c
+ * and prototypes of OS specific functions defined in os.c or os-inline.c
  */
 
 #include "ap_config.h"
@@ -20,7 +20,7 @@
  * part of the header
  */
 #define INLINE extern ap_inline
-#include "os ap_context_t nline.c"
+#include "os-inline.c"
 #endif
 
 #ifndef INLINE

diff --git a/os/unix/os.h b/os/unix/os.h
index 683f735326cab0b6cbf5a09c9284601980da89d6..54124c77fcb55cdd890eafb2ed68efd50f2fb5d9 100644 (file)
--- a/os/unix/os.h
+++ b/os/unix/os.h
@@ -67,7 +67,7 @@
 /*
  * This file in included in all Apache source code. It contains definitions
  * of facilities available on _this_ operating system (HAVE_* macros),
- * and prototypes of OS specific functions defined in os.c or os ap_context_t nline.c
+ * and prototypes of OS specific functions defined in os.c or os-inline.c
  */
 
 #if !defined(INLINE) && defined(USE_GNU_INLINE)