cvs: php4 /ext/calendar calendar.dsp php_calendar.h /main internal_functions_win32.c /win32 php4dllts.dsp php_modules.dsw

andi Thu Oct 5 17:03:02 2000 EDT Removed files: /php4/ext/calendar calendar.dsp Modified files: /php4/ext/calendar php_calendar.h /php4/main internal_functions_win32.c /php4/win32 php4dllts.dsp php_modules.dsw Log: - Add calendar to default Win32 build. Index: php4/ext/calendar/php_calendar.h diff -u php4/ext/calendar/php_calendar.h:1.3 php4/ext/calendar/php_calendar.h:1.4 --- php4/ext/calendar/php_calendar.h:1.3 Sun Jul 2 17:41:13 2000 +++ php4/ext/calendar/php_calendar.h Thu Oct 5 17:03:02 2000 @@ -1,12 +1,8 @@ #ifndef PHP_CALENDAR_H #define PHP_CALENDAR_H - - extern zend_module_entry calendar_module_entry; -#define calendar_module_ptr & calendar_module_entry - - +#define calendar_module_ptr &calendar_module_entry /* Functions */ Index: php4/main/internal_functions_win32.c diff -u php4/main/internal_functions_win32.c:1.32 php4/main/internal_functions_win32.c:1.33 --- php4/main/internal_functions_win32.c:1.32 Thu Oct 5 16:25:41 2000 +++ php4/main/internal_functions_win32.c Thu Oct 5 17:03:02 2000 @@ -18,7 +18,7 @@ */ -/* $Id: internal_functions_win32.c,v 1.32 2000/10/05 23:25:41 andi Exp $ */ +/* $Id: internal_functions_win32.c,v 1.33 2000/10/06 00:03:02 andi Exp $ */ #include "php.h" @@ -49,6 +49,7 @@ #include "ext/standard/php_output.h" #include "ext/standard/php_array.h" #include "ext/standard/php_assert.h" +#include "ext/calendar/php_calendar.h" #include "ext/com/php_COM.h" #include "ext/ftp/php_ftp.h" #include "ext/standard/reg.h" @@ -67,6 +68,7 @@ phpext_bcmath_ptr, #endif phpext_standard_ptr, + phpext_calendar_ptr, COM_module_ptr, phpext_ftp_ptr, phpext_pcre_ptr, Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.17 php4/win32/php4dllts.dsp:1.18 --- php4/win32/php4dllts.dsp:1.17 Thu Oct 5 16:25:41 2000 +++ php4/win32/php4dllts.dsp Thu Oct 5 17:03:02 2000 @@ -915,7 +915,7 @@ # PROP Default_Filter "" # Begin Group "Source Files No. 6" -# PROP Default_Filter "*.c" +# PROP Default_Filter ".c" # Begin Source File SOURCE=..\ext\ftp\ftp.c @@ -927,7 +927,7 @@ # End Group # Begin Group "Header Files No. 6" -# PROP Default_Filter "*.h" +# PROP Default_Filter ".h" # Begin Source File SOURCE=..\ext\ftp\ftp.h @@ -935,6 +935,58 @@ # Begin Source File SOURCE=..\ext\ftp\php_ftp.h +# End Source File +# End Group +# End Group +# Begin Group "Calendar" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 7" + +# PROP Default_Filter ".c" +# Begin Source File + +SOURCE=..\ext\calendar\cal_unix.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\calendar.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\dow.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\easter.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\french.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\gregor.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\jewish.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\julian.c +# End Source File +# End Group +# Begin Group "Header Files No. 7" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\ext\calendar\php_calendar.h +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\sdncal.h # End Source File # End Group # End Group Index: php4/win32/php_modules.dsw diff -u php4/win32/php_modules.dsw:1.24 php4/win32/php_modules.dsw:1.25 --- php4/win32/php_modules.dsw:1.24 Thu Oct 5 16:25:41 2000 +++ php4/win32/php_modules.dsw Thu Oct 5 17:03:02 2000 @@ -15,18 +15,6 @@ ############################################################################### -Project: "calendar"=..\ext\calendar\calendar.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - Project: "cpdf"=..\ext\cpdf\cpdf.dsp - Package Owner=<4> Package=<5>