*) ap_mpm.h: Fix include guard of ap_mpm.h to reference mpm

   instead of mmn.

Submitted by: Andr�� Malo
Reviewed by: rederpj, bnicholes

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

diff --git a/CHANGES b/CHANGES
index f030a51cc2f91b8cbc1ed20fba57d9ad34d288f9..4752f548b2c64f72df36ac92a0174f56715736da 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) ap_mpm.h: Fix include guard of ap_mpm.h to reference mpm
+     instead of mmn. [André Malo]
+
   *) mod_rewrite: Catch an edge case, where strange subsequent RewriteRules
      could lead to a 400 (Bad Request) response.  [André Malo]
 

diff --git a/STATUS b/STATUS
index 6ee26db042eaf31fb11f718e98a20aee4d1d3630..49a71c4da7754f907a689a54db04df97f5cff427 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/02/04 23:26:54 $]
+Last modified at [$Date: 2004/02/05 03:27:37 $]
 
 Release:
 
@@ -80,10 +80,6 @@ PATCHES TO BACKPORT FROM 2.1
   [ please place file names and revisions from HEAD here, so it is easy to
     identify exactly what the proposed changes are! ]
 
-    * Fix include guard of ap_mpm.h
-        include/ap_mpm.h: r1.38
-      +1: nd, rederpj, bnicholes
-
     * Fix file extensions for real media files and removed rpm extension
       from mime.types. PR 26079. (2.0 + 1.3)
         docs/conf/mime.types: r1.23

diff --git a/include/ap_mpm.h b/include/ap_mpm.h
index 76c898ab3ae0c3cb1ae546dece76c356d8429afe..d879691dac3ff12d405b6e026d370b9a37658bcc 100644 (file)
--- a/include/ap_mpm.h
+++ b/include/ap_mpm.h
@@ -52,8 +52,8 @@
  * <http://www.apache.org/>.
  */
 
-#ifndef AP_MMN_H
-#define AP_MMN_H
+#ifndef AP_MPM_H
+#define AP_MPM_H
 
 #include "apr_thread_proc.h"