diff options
| author | Anatol Belski <ab@php.net> | 2014-01-28 13:10:01 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-01-28 13:10:01 +0100 |
| commit | b1396cc7a5d4879df58e1ac8600a45ca107b28e5 (patch) | |
| tree | cac77f0c141cafcfd42fd68662953879d7442910 | |
| parent | aafce7353eb90d6728205abc950a0197740d0cfa (diff) | |
| parent | 07f3bac6caca5cb1605cb18ab819bcd8c0fa4291 (diff) | |
| download | php-git-b1396cc7a5d4879df58e1ac8600a45ca107b28e5.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix *.dsp files related to bug #50333
| -rw-r--r-- | TSRM/TSRM.dsp | 4 | ||||
| -rw-r--r-- | Zend/Zend.dsp | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/TSRM/TSRM.dsp b/TSRM/TSRM.dsp index 6c3e8bfb8b..8604bc0da8 100644 --- a/TSRM/TSRM.dsp +++ b/TSRM/TSRM.dsp @@ -171,10 +171,6 @@ SOURCE=.\tsrm_strtok_r.h # End Source File # Begin Source File -SOURCE=.\tsrm_virtual_cwd.h -# End Source File -# Begin Source File - SOURCE=.\tsrm_win32.h # End Source File # End Group diff --git a/Zend/Zend.dsp b/Zend/Zend.dsp index 348e1abaa5..98d368fb16 100644 --- a/Zend/Zend.dsp +++ b/Zend/Zend.dsp @@ -269,6 +269,10 @@ SOURCE=.\zend_variables.c SOURCE=.\zend_vm_opcodes.c
# End Source File
+# Begin Source File
+
+SOURCE=.\zend_virtual_cwd.c
+# End Source File
# End Group
# Begin Group "Header Files"
@@ -437,10 +441,6 @@ SOURCE=.\zend_ts_hash.h SOURCE=.\zend_variables.h
# End Source File
-# Begin Source File
-
-SOURCE=.\zend_virtual_cwd.c
-# End Source File
# End Group
# Begin Group "Parsers"
|