httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@hyperreal.org
Subject cvs commit: apache-1.3/src/os/win32 ApacheModuleStatus.mak
Date Wed, 12 Aug 1998 19:22:21 GMT
ben         98/08/12 12:22:21

  Modified:    src/include http_conf_globals.h
               src/main http_main.c
               src/os/win32 ApacheModuleStatus.mak
  Log:
  Make Win32 work again.
  
  Revision  Changes    Path
  1.34      +1 -1      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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- http_conf_globals.h	1998/08/11 00:09:43	1.33
  +++ http_conf_globals.h	1998/08/12 19:22:18	1.34
  @@ -85,7 +85,7 @@
   extern MODULE_VAR_EXPORT int ap_suexec_enabled;
   extern int ap_listenbacklog;
   extern int ap_dump_settings;
  -extern int ap_extended_status;
  +extern API_VAR_EXPORT int ap_extended_status;
   
   extern char *ap_pid_fname;
   extern char *ap_scoreboard_fname;
  
  
  
  1.386     +1 -1      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.385
  retrieving revision 1.386
  diff -u -r1.385 -r1.386
  --- http_main.c	1998/08/12 10:33:39	1.385
  +++ http_main.c	1998/08/12 19:22:18	1.386
  @@ -247,7 +247,7 @@
   int ap_suexec_enabled = 0;
   int ap_listenbacklog;
   int ap_dump_settings;
  -int ap_extended_status = 0;
  +API_VAR_EXPORT int ap_extended_status = 0;
   
   /*
    * The max child slot ever assigned, preserved across restarts.  Necessary
  
  
  
  1.13      +63 -33    apache-1.3/src/os/win32/ApacheModuleStatus.mak
  
  Index: ApacheModuleStatus.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/ApacheModuleStatus.mak,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ApacheModuleStatus.mak	1998/04/09 08:20:33	1.12
  +++ ApacheModuleStatus.mak	1998/08/12 19:22:20	1.13
  @@ -30,10 +30,6 @@
   NULL=nul
   !ENDIF 
   
  -CPP=cl.exe
  -MTL=midl.exe
  -RSC=rc.exe
  -
   !IF  "$(CFG)" == "ApacheModuleStatus - Win32 Release"
   
   OUTDIR=.\ApacheModuleStatusR
  @@ -62,12 +58,46 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D\
    "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX\
    /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleStatusR/
   CPP_SBRS=.
  +
  +.c{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.c{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +MTL=midl.exe
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  +RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleStatus.bsc" 
   BSC32_SBRS= \
  @@ -117,32 +147,13 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D\
    "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fp"$(INTDIR)\ApacheModuleStatus.pch"\
    /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\ApacheModuleStatusD/
   CPP_SBRS=.
  -MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  -BSC32=bscmake.exe
  -BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleStatus.bsc" 
  -BSC32_SBRS= \
  -	
  -LINK32=link.exe
  -LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  - winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  - /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /debug\
  - /machine:I386 /out:"$(OUTDIR)\ApacheModuleStatus.dll"\
  - /implib:"$(OUTDIR)\ApacheModuleStatus.lib" 
  -LINK32_OBJS= \
  -	"$(INTDIR)\mod_status.obj"
   
  -"$(OUTDIR)\ApacheModuleStatus.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  -    $(LINK32) @<<
  -  $(LINK32_FLAGS) $(LINK32_OBJS)
  -<<
  -
  -!ENDIF 
  -
   .c{$(CPP_OBJS)}.obj::
      $(CPP) @<<
      $(CPP_PROJ) $< 
  @@ -173,7 +184,30 @@
      $(CPP_PROJ) $< 
   <<
   
  +MTL=midl.exe
  +MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  +RSC=rc.exe
  +BSC32=bscmake.exe
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleStatus.bsc" 
  +BSC32_SBRS= \
  +	
  +LINK32=link.exe
  +LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
  + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
  + /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /debug\
  + /machine:I386 /out:"$(OUTDIR)\ApacheModuleStatus.dll"\
  + /implib:"$(OUTDIR)\ApacheModuleStatus.lib" 
  +LINK32_OBJS= \
  +	"$(INTDIR)\mod_status.obj"
  +
  +"$(OUTDIR)\ApacheModuleStatus.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
  +    $(LINK32) @<<
  +  $(LINK32_FLAGS) $(LINK32_OBJS)
  +<<
  +
  +!ENDIF 
   
  +
   !IF "$(CFG)" == "ApacheModuleStatus - Win32 Release" || "$(CFG)" ==\
    "ApacheModuleStatus - Win32 Debug"
   SOURCE=..\..\modules\standard\mod_status.c
  @@ -183,9 +217,11 @@
   DEP_CPP_MOD_S=\
   	"..\..\include\alloc.h"\
   	"..\..\include\ap.h"\
  +	"..\..\include\ap_config.h"\
  +	"..\..\include\ap_ctype.h"\
   	"..\..\include\buff.h"\
  -	"..\..\include\conf.h"\
   	"..\..\include\hsregex.h"\
  +	"..\..\include\http_conf_globals.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_core.h"\
   	"..\..\include\http_log.h"\
  @@ -197,13 +233,6 @@
   	"..\..\include\util_uri.h"\
   	".\os.h"\
   	".\readdir.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_S=\
  -	"..\..\include\ebcdic.h"\
  -	"..\..\include\os.h"\
  -	"..\..\include\sfio.h"\
   	
   
   "$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
  @@ -215,8 +244,9 @@
   DEP_CPP_MOD_S=\
   	"..\..\include\alloc.h"\
   	"..\..\include\ap.h"\
  +	"..\..\include\ap_config.h"\
  +	"..\..\include\ap_ctype.h"\
   	"..\..\include\buff.h"\
  -	"..\..\include\conf.h"\
   	"..\..\include\hsregex.h"\
   	"..\..\include\http_config.h"\
   	"..\..\include\http_core.h"\
  
  
  

Mime
View raw message