fixing issue with C/C++ linkage

Signed-off-by: Dusan Malusev <[email protected]>
he4rt · Jun 10, 2024 · 6ca7022 · 6ca7022
1 parent 6b60de3
commit 6ca7022
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/include/php_driver.h b/include/php_driver.h
@@ -50,14 +50,6 @@ extern "C"
 #endif
 
 
-#include <ext/spl/spl_exceptions.h>
-#include <ext/spl/spl_iterators.h>
-
-#include "api.h"
-#include "DateTime/Date.h"
-#include "RetryPolicy/RetryPolicy.h"
-#include "SSLOptions/SSLOptions.h"
-
 #define PHP_DRIVER_NAMESPACE "Cassandra"
 
 #define PHP_DRIVER_NAMESPACE_ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null)                               \

diff --git a/src/DateTime/Duration.cpp b/src/DateTime/Duration.cpp
@@ -7,6 +7,7 @@
 #include <util/types.h>
 
 BEGIN_EXTERN_C()
+#include <spl/spl_exceptions.h>
 
 zend_class_entry *php_driver_duration_ce = nullptr;
 

diff --git a/src/Exception/DomainException.cpp b/src/Exception/DomainException.cpp
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
+
 #include "php_driver.h"
 #include "php_driver_types.h"
 
 BEGIN_EXTERN_C()
+#include <spl/spl_exceptions.h>
 
 zend_class_entry *php_driver_domain_exception_ce = NULL;
 

diff --git a/src/Exception/InvalidArgumentException.cpp b/src/Exception/InvalidArgumentException.cpp
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
+
 #include "php_driver.h"
 #include "php_driver_types.h"
 BEGIN_EXTERN_C()
+#include <spl/spl_exceptions.h>
 
 zend_class_entry *php_driver_invalid_argument_exception_ce = NULL;
 

diff --git a/src/Exception/LogicException.cpp b/src/Exception/LogicException.cpp
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+
 #include "php_driver.h"
 #include "php_driver_types.h"
 BEGIN_EXTERN_C()
+#include <spl/spl_exceptions.h>
+
 zend_class_entry *php_driver_logic_exception_ce = NULL;
 
 static zend_function_entry LogicException_methods[] = {

diff --git a/src/Exception/RuntimeException.cpp b/src/Exception/RuntimeException.cpp
@@ -14,9 +14,13 @@
  * limitations under the License.
  */
 
+
 #include "php_driver.h"
 #include "php_driver_types.h"
 BEGIN_EXTERN_C()
+#include <spl/spl_exceptions.h>
+
+
 zend_class_entry *php_driver_runtime_exception_ce = NULL;
 
 static zend_function_entry RuntimeException_methods[] = {