summaryrefslogtreecommitdiff
path: root/php/src/php7/Communicator.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-05-11 17:50:09 -0400
committerBernard Normier <bernard@zeroc.com>2016-05-11 17:50:09 -0400
commitff76da01915482dc5c5bcc693789642882958d64 (patch)
treeb57639e7490f850fbec23c50f159c408689234e5 /php/src/php7/Communicator.cpp
parentcleaning up stream API in C++/Java/JS (diff)
downloadice-ff76da01915482dc5c5bcc693789642882958d64.tar.bz2
ice-ff76da01915482dc5c5bcc693789642882958d64.tar.xz
ice-ff76da01915482dc5c5bcc693789642882958d64.zip
IceUtil and Slice msbuild updates
Diffstat (limited to 'php/src/php7/Communicator.cpp')
-rw-r--r--php/src/php7/Communicator.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/php/src/php7/Communicator.cpp b/php/src/php7/Communicator.cpp
index f879942ef65..e9c00aa4c28 100644
--- a/php/src/php7/Communicator.cpp
+++ b/php/src/php7/Communicator.cpp
@@ -19,6 +19,11 @@
#include <IceUtil/StringUtil.h>
#include <IceUtil/Timer.h>
+#ifdef getcwd
+#undef getcwd
+#endif
+#include <IceUtil/FileUtil.h>
+
using namespace std;
using namespace IcePHP;
@@ -1526,7 +1531,7 @@ parseProfiles(const string& file)
// ice.config = config-file
// ice.options = args
//
- ifstream in(file.c_str());
+ IceUtilInternal::ifstream in(file);
if(!in)
{
php_error_docref(0, E_WARNING, "unable to open Ice profiles in %s", file.c_str());