- Add calendar to default Win32 build.

5 files changed, 57 insertions, 164 deletions

diff --git a/ext/calendar/calendar.dsp b/ext/calendar/calendar.dsp
deleted file mode 100644
index 5dd1b720e2..0000000000
--- a/ext/calendar/calendar.dsp
+++ /dev/null
@@ -1,145 +0,0 @@
-# Microsoft Developer Studio Project File - Name="calendar" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=calendar - Win32 Release_TS

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "calendar.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "calendar.mak" CFG="calendar - Win32 Release_TS"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "calendar - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "calendar - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "calendar - Win32 Release_TS"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release_TS"

-# PROP BASE Intermediate_Dir "Release_TS"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release_TS"

-# PROP Intermediate_Dir "Release_TS"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

-# 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

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x406 /d "NDEBUG"

-# ADD RSC /l 0x406 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# 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

-# 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"

-

-!ELSEIF  "$(CFG)" == "calendar - Win32 Debug_TS"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Debug_TS"

-# PROP BASE Intermediate_Dir "Debug_TS"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Debug_TS"

-# PROP Intermediate_Dir "Debug_TS"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

-# 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

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x406 /d "NDEBUG"

-# ADD RSC /l 0x406 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# 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

-# 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"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "calendar - Win32 Release_TS"

-# Name "calendar - Win32 Debug_TS"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\cal_unix.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\calendar.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\dow.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\easter.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\french.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\gregor.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\jewish.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\julian.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\calendar.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sdncal.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/ext/calendar/php_calendar.h b/ext/calendar/php_calendar.h
index 4802d22bb7..d56d3af19a 100644
--- 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 d9fe462ada..9088251463 100644
--- 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 da71bf3d3d..f8b09aac88 100644
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -915,7 +915,7 @@ SOURCE=..\ext\xml\expat\xmltok\xmltok_ns.c
 # 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 @@ SOURCE=..\ext\ftp\php_ftp.c
 # End Group

 # Begin Group "Header Files No. 6"

 

-# PROP Default_Filter "*.h"

+# PROP Default_Filter ".h"

 # Begin Source File

 

 SOURCE=..\ext\ftp\ftp.h

@@ -938,6 +938,58 @@ 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

 # End Group

 # Begin Group "Win32"

 

diff --git a/win32/php_modules.dsw b/win32/php_modules.dsw
index fbc5b668e0..c75b1cb5ed 100644
--- a/win32/php_modules.dsw
+++ b/win32/php_modules.dsw
@@ -15,18 +15,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "calendar"=..\ext\calendar\calendar.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "cpdf"=..\ext\cpdf\cpdf.dsp - Package Owner=<4>

 

 Package=<5>