Massive commit to clean up os/win32 and label some files with the

  appropriate license blocks and #ifdef WIN32 wrappers.

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

diff --git a/server/mpm/winnt/Win9xConHook.c b/server/mpm/winnt/Win9xConHook.c
index 8bd25ad03c5cc638bf07520d1eca3c3952997487..a285329b43ed7592d63ba2045eb5b96289e90345 100644 (file)
--- a/server/mpm/winnt/Win9xConHook.c
+++ b/server/mpm/winnt/Win9xConHook.c
@@ -56,6 +56,7 @@
  * University of Illinois, Urbana-Champaign.
  */
 
+#ifdef WIN32
 
 /*
  * Win9xConHook.dll - a hook proc to clean up Win95/98 console behavior.
@@ -735,4 +736,4 @@ VOID DbgPrintf(
 }
 #endif
 
-
+#endif /* WIN32 */

diff --git a/server/mpm/winnt/Win9xConHook.dsp b/server/mpm/winnt/Win9xConHook.dsp
index 56ad1180a9d4e7fb4e67fee1eaa2467d4d6f0358..4d38e3995dff0207ca6f85e7381c73fa475c9071 100644 (file)
--- a/server/mpm/winnt/Win9xConHook.dsp
+++ b/server/mpm/winnt/Win9xConHook.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Win9xConHook" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
@@ -22,7 +22,6 @@ CFG=Win9xConHook - Win32 Release
 !MESSAGE 
 
 # Begin Project
-# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -68,8 +67,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\Win9xConHook" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\Win9xConHook" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"

diff --git a/server/mpm/winnt/Win9xConHook.h b/server/mpm/winnt/Win9xConHook.h
index df07d301b782c0b8fa06f2ca6f65d86c81d61fa6..312e82cd2de01451a2128006eb8ec6603cecbb4f 100644 (file)
--- a/server/mpm/winnt/Win9xConHook.h
+++ b/server/mpm/winnt/Win9xConHook.h
@@ -56,6 +56,10 @@
  * University of Illinois, Urbana-Champaign.
  */
 
+#ifndef AP_WIN9XCONHOOK_H
+#define AP_WIN9XCONHOOK_H
+
+#ifdef WIN32
 
 /* Windows9xServiceCtrlHandler registers a handler routine, frees the
  * console window, and registers this process as a service in Win9x.
@@ -89,3 +93,7 @@ BOOL WINAPI FixConsoleCtrlHandler(PHANDLER_ROUTINE phandler, BOOL add);
  *
  * LRESULT CALLBACK CallWndProc(INT hc, WPARAM wParam, LPARAM lParam);
  */
+
+#endif /* WIN32 */
+
+#endif AP_WIN9XCONHOOK_H
\ No newline at end of file