httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr aprlib.dsp aprlib.mak aprlib.def
Date Fri, 14 Apr 2000 15:02:14 GMT
stoddard    00/04/14 08:02:14

  Modified:    src/lib/apr aprlib.dsp aprlib.mak aprlib.def
  Log:
  Win32: Update VC++ project files to remove threadcancel.c
  
  Revision  Changes    Path
  1.16      +0 -4      apache-2.0/src/lib/apr/aprlib.dsp
  
  Index: aprlib.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.dsp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- aprlib.dsp	2000/04/07 02:16:55	1.15
  +++ aprlib.dsp	2000/04/14 15:02:13	1.16
  @@ -221,10 +221,6 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\threadproc\win32\threadcancel.c
  -# End Source File
  -# Begin Source File
  -
   SOURCE=.\threadproc\win32\threadpriv.c
   # End Source File
   # Begin Source File
  
  
  
  1.16      +29 -74    apache-2.0/src/lib/apr/aprlib.mak
  
  Index: aprlib.mak
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.mak,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- aprlib.mak	2000/04/07 02:16:55	1.15
  +++ aprlib.mak	2000/04/14 15:02:13	1.16
  @@ -78,7 +78,6 @@
   	-@erase "$(INTDIR)\sockopt.obj"
   	-@erase "$(INTDIR)\start.obj"
   	-@erase "$(INTDIR)\thread.obj"
  -	-@erase "$(INTDIR)\threadcancel.obj"
   	-@erase "$(INTDIR)\threadpriv.obj"
   	-@erase "$(INTDIR)\time.obj"
   	-@erase "$(INTDIR)\timestr.obj"
  @@ -139,7 +138,6 @@
   	"$(INTDIR)\sockopt.obj" \
   	"$(INTDIR)\start.obj" \
   	"$(INTDIR)\thread.obj" \
  -	"$(INTDIR)\threadcancel.obj" \
   	"$(INTDIR)\threadpriv.obj" \
   	"$(INTDIR)\time.obj" \
   	"$(INTDIR)\timestr.obj"
  @@ -198,7 +196,6 @@
   	-@erase "$(INTDIR)\sockopt.obj"
   	-@erase "$(INTDIR)\start.obj"
   	-@erase "$(INTDIR)\thread.obj"
  -	-@erase "$(INTDIR)\threadcancel.obj"
   	-@erase "$(INTDIR)\threadpriv.obj"
   	-@erase "$(INTDIR)\time.obj"
   	-@erase "$(INTDIR)\timestr.obj"
  @@ -263,7 +260,6 @@
   	"$(INTDIR)\sockopt.obj" \
   	"$(INTDIR)\start.obj" \
   	"$(INTDIR)\thread.obj" \
  -	"$(INTDIR)\threadcancel.obj" \
   	"$(INTDIR)\threadpriv.obj" \
   	"$(INTDIR)\time.obj" \
   	"$(INTDIR)\timestr.obj"
  @@ -344,7 +340,7 @@
   	
   
   "$(INTDIR)\access.obj" : $(SOURCE) $(DEP_CPP_ACCES) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -385,7 +381,7 @@
   	
   
   "$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) $(DEP_CPP_APR_C) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -493,7 +489,7 @@
   	
   
   "$(INTDIR)\apr_getpass.obj" : $(SOURCE) $(DEP_CPP_APR_G) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -585,7 +581,7 @@
   	
   
   "$(INTDIR)\apr_pools.obj" : $(SOURCE) $(DEP_CPP_APR_P) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -673,7 +669,7 @@
   	
   
   "$(INTDIR)\apr_tables.obj" : $(SOURCE) $(DEP_CPP_APR_T) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -726,8 +722,8 @@
   	".\time\win32\atime.h"\
   	
   
  -"$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  +"$(INTDIR)\dir.obj" : $(SOURCE) $(DEP_CPP_DIR_C) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -773,8 +769,8 @@
   	".\include\apr_time.h"\
   	
   
  -"$(INTDIR)\dso.obj" : $(SOURCE) $(DEP_CPP_DSO_C) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  +"$(INTDIR)\dso.obj" : $(SOURCE) $(DEP_CPP_DSO_C) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -820,7 +816,7 @@
   	
   
   "$(INTDIR)\fileacc.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -866,7 +862,7 @@
   	
   
   "$(INTDIR)\filedup.obj" : $(SOURCE) $(DEP_CPP_FILED) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -914,7 +910,7 @@
   	
   
   "$(INTDIR)\filestat.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1042,7 +1038,7 @@
   	
   
   "$(INTDIR)\names.obj" : $(SOURCE) $(DEP_CPP_NAMES) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1139,8 +1135,8 @@
   	".\include\apr_time.h"\
   	
   
  -"$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  +"$(INTDIR)\pipe.obj" : $(SOURCE) $(DEP_CPP_PIPE_) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1283,7 +1279,7 @@
   	
   
   "$(INTDIR)\readwrite.obj" : $(SOURCE) $(DEP_CPP_READW) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1328,8 +1324,8 @@
   	".\include\apr_time.h"\
   	
   
  -"$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  +"$(INTDIR)\seek.obj" : $(SOURCE) $(DEP_CPP_SEEK_) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1427,7 +1423,7 @@
   	
   
   "$(INTDIR)\signals.obj" : $(SOURCE) $(DEP_CPP_SIGNA) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1607,7 +1603,7 @@
   	
   
   "$(INTDIR)\start.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1656,48 +1652,7 @@
   	
   
   "$(INTDIR)\thread.obj" : $(SOURCE) $(DEP_CPP_THREA) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\threadproc\win32\threadcancel.c
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
  -
  -DEP_CPP_THREAD=\
  -	".\include\apr.h"\
  -	".\include\apr_config.h"\
  -	".\include\apr_errno.h"\
  -	".\include\apr_file_io.h"\
  -	".\include\apr_general.h"\
  -	".\include\apr_thread_proc.h"\
  -	".\include\apr_time.h"\
  -	".\threadproc\win32\threadproc.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -
  -"$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  -	$(CPP) $(CPP_PROJ) $(SOURCE)
  -
  -
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  -
  -DEP_CPP_THREAD=\
  -	".\include\apr.h"\
  -	".\include\apr_config.h"\
  -	".\include\apr_errno.h"\
  -	".\include\apr_file_io.h"\
  -	".\include\apr_general.h"\
  -	".\include\apr_thread_proc.h"\
  -	".\include\apr_time.h"\
  -	".\threadproc\win32\threadproc.h"\
  -	
  -
  -"$(INTDIR)\threadcancel.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1707,7 +1662,7 @@
   
   !IF  "$(CFG)" == "aprlib - Win32 Release"
   
  -DEP_CPP_THREADP=\
  +DEP_CPP_THREAD=\
   	".\include\apr.h"\
   	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
  @@ -1723,14 +1678,14 @@
   	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREADP) "$(INTDIR)"\
  +"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"\
    ".\include\apr_config.h" ".\include\apr.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
   
  -DEP_CPP_THREADP=\
  +DEP_CPP_THREAD=\
   	".\include\apr.h"\
   	".\include\apr_config.h"\
   	".\include\apr_errno.h"\
  @@ -1745,8 +1700,8 @@
   	".\threadproc\win32\threadproc.h"\
   	
   
  -"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREADP) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  +"$(INTDIR)\threadpriv.obj" : $(SOURCE) $(DEP_CPP_THREAD) "$(INTDIR)"\
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1794,8 +1749,8 @@
   	".\time\win32\atime.h"\
   	
   
  -"$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  +"$(INTDIR)\time.obj" : $(SOURCE) $(DEP_CPP_TIME_) "$(INTDIR)" ".\include\apr.h"\
  + ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -1842,7 +1797,7 @@
   	
   
   "$(INTDIR)\timestr.obj" : $(SOURCE) $(DEP_CPP_TIMES) "$(INTDIR)"\
  - ".\include\apr_config.h" ".\include\apr.h"
  + ".\include\apr.h" ".\include\apr_config.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  
  
  
  1.18      +1 -1      apache-2.0/src/lib/apr/aprlib.def
  
  Index: aprlib.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- aprlib.def	2000/04/07 02:16:55	1.17
  +++ aprlib.def	2000/04/14 15:02:13	1.18
  @@ -104,7 +104,7 @@
   	ap_thread_exit   @95
   	ap_thread_join   @96
   	ap_thread_detach   @97
  -	ap_cancel_thread   @98
  +;	ap_cancel_thread   @98
   	ap_create_thread_private   @99
   	ap_get_thread_private   @100
   	ap_set_thread_private   @101
  
  
  

Mime
View raw message