From: Zeev Suraski <zeev@php.net>
Date: Sat, 25 Mar 2000 19:17:41 +0000 (+0000)
Subject: - Update dsp
X-Git-Tag: PHP-4.0-RC1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=863e6fd2421479e57abf2b03dda30197d5c1e99c;p=php

- Update dsp
- Remove unnecessary includes
---

diff --git a/ext/mysql/libmysql/libmysql.dsp b/ext/mysql/libmysql/libmysql.dsp
index cb15a9c1bc..bbf3abe5a6 100644
--- a/ext/mysql/libmysql/libmysql.dsp
+++ b/ext/mysql/libmysql/libmysql.dsp
@@ -110,8 +110,8 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "libmysql___Win32_Debug"
-# PROP Intermediate_Dir "libmysql___Win32_Debug"
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "__WIN32__" /D "USE_TLS" /YX /FD /GZ /c
 # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "__WIN32__" /D "USE_TLS" /YX /FD /GZ /c
@@ -133,8 +133,8 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "libmysql___Win32_Release"
-# PROP Intermediate_Dir "libmysql___Win32_Release"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "__WIN32__" /D "USE_TLS" /YX /FD /c
 # ADD CPP /nologo /MDd /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "__WIN32__" /D "USE_TLS" /YX /FD /c
@@ -156,8 +156,8 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "libmysql___Win32_Release_inline"
-# PROP Intermediate_Dir "libmysql___Win32_Release_inline"
+# PROP Output_Dir "Release_inline"
+# PROP Intermediate_Dir "Release_inline"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "__WIN32__" /D "USE_TLS" /YX /FD /c
 # ADD CPP /nologo /MDd /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "__WIN32__" /D "USE_TLS" /YX /FD /c
diff --git a/main/php.h b/main/php.h
index 8cd8f02088..4bbb694b5f 100644
--- a/main/php.h
+++ b/main/php.h
@@ -285,8 +285,6 @@ PHPAPI int cfg_get_string(char *varname, char **result);
 #define PUTC_H(c)					(php_header_write(&(c), 1), (c))
 
 
-#include "zend_operators.h"
-#include "zend_variables.h"
 #include "zend_constants.h"
 
 /* connection status states */