fixed conflict

1 files changed, 12 insertions, 0 deletions

diff --git a/zend/extension.cpp b/zend/extension.cpp
index 9685b32..1545f89 100644
--- a/zend/extension.cpp
+++ b/zend/extension.cpp
@@ -97,6 +97,18 @@ void *Extension::module()
 }
 
 /**
+ *  Is the extension object in a locked state? This happens after the
+ *  get_module() function was called for the first time ("apache reload"
+ *  forces a new call to get_module())
+ * 
+ *  @return bool
+ */
+bool Extension::locked() const
+{
+    return _impl->locked();
+}
+
+/**
  *  End of namespace
  */
 }