summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2015-04-13 21:03:32 +0200
committerEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2015-04-13 21:03:32 +0200
commit44a1c7c9fc8c17f32598f05a2909283183b159b6 (patch)
tree6eb3341c6b0e04c9afd56284abdf8f26bd7a66aa
parentcbc98a28b2c0b8373cff40e357f262bec1b759b2 (diff)
parent9a1c12578b97507d676081bf9a395248f9904a8c (diff)
Merge branch 'master' of https://github.com/CopernicaMarketingSoftware/PHP-CPP
-rw-r--r--zend/extensionpath.h9
-rw-r--r--zend/module.h2
2 files changed, 10 insertions, 1 deletions
diff --git a/zend/extensionpath.h b/zend/extensionpath.h
index c46319a..1c5e87d 100644
--- a/zend/extensionpath.h
+++ b/zend/extensionpath.h
@@ -64,6 +64,15 @@ public:
{
return _path;
}
+
+ /**
+ * Cast to const-char*
+ * @return const char *
+ */
+ operator const char * () const
+ {
+ return _path.c_str();
+ }
};
/**
diff --git a/zend/module.h b/zend/module.h
index 374c9d6..efb06af 100644
--- a/zend/module.h
+++ b/zend/module.h
@@ -141,7 +141,7 @@ public:
ExtensionPath path(module TSRMLS_CC);
// load the module
- _handle = DL_LOAD(module);
+ _handle = DL_LOAD(path);
// handle should be valid
if (!_handle) return;