- Add calendar to default Win32 build.

diff --git a/ext/calendar/calendar.dsp b/ext/calendar/calendar.dsp
deleted file mode 100644 (file)
index 5dd1b72..0000000
--- a/ext/calendar/calendar.dsp
+++ /dev/null
@@ -1,145 +0,0 @@
-# Microsoft Developer Studio Project File - Name="calendar" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=calendar - Win32 Release_TS\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "calendar.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "calendar.mak" CFG="calendar - Win32 Release_TS"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "calendar - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "calendar - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "calendar - Win32 Release_TS"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release_TS"\r
-# PROP BASE Intermediate_Dir "Release_TS"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release_TS"\r
-# PROP Intermediate_Dir "Release_TS"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_CALENDAR" /D ZTS=1 /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CALENDAR_EXPORTS" /D "COMPILE_DL_CALENDAR" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_CALENDAR=1 /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x406 /d "NDEBUG"\r
-# ADD RSC /l 0x406 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_calendar.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"\r
-\r
-!ELSEIF  "$(CFG)" == "calendar - Win32 Debug_TS"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Debug_TS"\r
-# PROP BASE Intermediate_Dir "Debug_TS"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Debug_TS"\r
-# PROP Intermediate_Dir "Debug_TS"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_CALENDAR" /D ZTS=1 /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CALENDAR_EXPORTS" /D "COMPILE_DL_CALENDAR" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_CALENDAR=1 /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x406 /d "NDEBUG"\r
-# ADD RSC /l 0x406 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_calendar.dll" /libpath:"..\..\Debug_TS"\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "calendar - Win32 Release_TS"\r
-# Name "calendar - Win32 Debug_TS"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\cal_unix.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\calendar.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dow.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\easter.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\french.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gregor.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\jewish.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\julian.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\calendar.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sdncal.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# End Target\r
-# End Project\r

diff --git a/ext/calendar/php_calendar.h b/ext/calendar/php_calendar.h
index 4802d22bb7ca95318f918379c60f4711fc1652c9..d56d3af19ab6e28dadebf3d891ad97f571970f3b 100644 (file)
--- a/ext/calendar/php_calendar.h
+++ b/ext/calendar/php_calendar.h
@@ -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 */
 

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index d9fe462adafccf9cc23c045ad47ebc41536941a3..9088251463fa360f042e93605e3d5789513c6042 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -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 @@ zend_module_entry *php_builtin_extensions[] = {
        phpext_bcmath_ptr,
 #endif
        phpext_standard_ptr,
+       phpext_calendar_ptr,
        COM_module_ptr,
        phpext_ftp_ptr,
        phpext_pcre_ptr,

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index da71bf3d3d1924b66269442d1d1d4d20eb95109e..f8b09aac8884dc021658604c1fe258eabfddcb9a 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -915,7 +915,7 @@ SOURCE=..\ext\xml\expat\xmltok\xmltok_ns.c
 # PROP Default_Filter ""\r
 # Begin Group "Source Files No. 6"\r
 \r
-# PROP Default_Filter "*.c"\r
+# PROP Default_Filter ".c"\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\ftp\ftp.c\r
@@ -927,7 +927,7 @@ SOURCE=..\ext\ftp\php_ftp.c
 # End Group\r
 # Begin Group "Header Files No. 6"\r
 \r
-# PROP Default_Filter "*.h"\r
+# PROP Default_Filter ".h"\r
 # Begin Source File\r
 \r
 SOURCE=..\ext\ftp\ftp.h\r
@@ -938,6 +938,58 @@ SOURCE=..\ext\ftp\php_ftp.h
 # End Source File\r
 # End Group\r
 # End Group\r
+# Begin Group "Calendar"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Group "Source Files No. 7"\r
+\r
+# PROP Default_Filter ".c"\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\calendar\cal_unix.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\calendar\calendar.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\calendar\dow.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\calendar\easter.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\calendar\french.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\calendar\gregor.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\calendar\jewish.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\calendar\julian.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files No. 7"\r
+\r
+# PROP Default_Filter ".h"\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\calendar\php_calendar.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\calendar\sdncal.h\r
+# End Source File\r
+# End Group\r
+# End Group\r
 # End Group\r
 # Begin Group "Win32"\r
 \r

diff --git a/win32/php_modules.dsw b/win32/php_modules.dsw
index fbc5b668e03659462af6df3233b6cffd44dd45b7..c75b1cb5ed82dd45875216d5bb817a1f4c00f02a 100644 (file)
--- a/win32/php_modules.dsw
+++ b/win32/php_modules.dsw
@@ -15,18 +15,6 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "calendar"=..\ext\calendar\calendar.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-###############################################################################\r
-\r
 Project: "cpdf"=..\ext\cpdf\cpdf.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r