Merge pull request #314

jmikola · jmikola · commit 506122118007 · 2016-05-09T10:44:54.000-04:00
diff --git a/config.m4 b/config.m4
@@ -369,7 +369,6 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
         LIBMONGOC_LIB=`$PKG_CONFIG libmongoc-priv --libs`
         LIBMONGOC_VER=`$PKG_CONFIG libmongoc-priv --modversion`
         AC_MSG_RESULT(version $LIBMONGOC_VER found)
-        CFLAGS="$CFLAGS -DMONGOC_I_AM_A_DRIVER"
 
       else
         AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.3.3)
diff --git a/php_phongo.c b/php_phongo.c
@@ -27,10 +27,6 @@
 /* External libs */
 #include "bson.h"
 #include "mongoc.h"
-#include "mongoc-cursor-cursorid-private.h"
-#include "mongoc-bulk-operation-private.h"
-#include "mongoc-read-concern-private.h"
-#include "mongoc-write-concern-private.h"
 #include "mongoc-trace.h"
 
 
diff --git a/php_phongo.h b/php_phongo.h
@@ -22,7 +22,6 @@
 /* External libs */
 #include "bson.h"
 #include "mongoc.h"
-#include "mongoc-topology-description-private.h"
 
 #define phpext_mongodb_ptr &mongodb_module_entry
 extern zend_module_entry mongodb_module_entry;
diff --git a/php_phongo_structs-5.h b/php_phongo_structs-5.h
@@ -26,7 +26,6 @@
 
 /* PHP Core stuff */
 #include <php.h>
-#include <mongoc-bulk-operation-private.h>
 
 /* Our stuffz */
 #include "php_bson.h"
diff --git a/php_phongo_structs-7.h b/php_phongo_structs-7.h
@@ -26,7 +26,6 @@
 
 /* PHP Core stuff */
 #include <php.h>
-#include <mongoc-bulk-operation-private.h>
 
 /* Our stuffz */
 #include "php_bson.h"
diff --git a/src/MongoDB/BulkWrite.c b/src/MongoDB/BulkWrite.c
@@ -28,9 +28,6 @@
 #include <bson.h>
 #include <mongoc.h>
 
-/* We need to access the internal bulk structure to access the bulk op count */
-#include <mongoc-bulk-operation-private.h>
-
 /* PHP Core stuff */
 #include <php.h>
 #include <php_ini.h>
diff --git a/src/MongoDB/Cursor.c b/src/MongoDB/Cursor.c
@@ -27,8 +27,6 @@
 /* External libs */
 #include <bson.h>
 #include <mongoc.h>
-#include <mongoc-cursor-private.h>
-#include <mongoc-bulk-operation-private.h>
 
 /* PHP Core stuff */
 #include <php.h>
diff --git a/src/MongoDB/Manager.c b/src/MongoDB/Manager.c
@@ -27,8 +27,6 @@
 /* External libs */
 #include <bson.h>
 #include <mongoc.h>
-#include <mongoc-client-private.h>
-#include <mongoc-host-list-private.h>
 
 /* PHP Core stuff */
 #include <php.h>
diff --git a/src/MongoDB/ReadConcern.c b/src/MongoDB/ReadConcern.c
@@ -27,7 +27,6 @@
 /* External libs */
 #include <bson.h>
 #include <mongoc.h>
-#include <mongoc-read-concern-private.h>
 
 /* PHP Core stuff */
 #include <php.h>
diff --git a/src/MongoDB/Server.c b/src/MongoDB/Server.c
@@ -27,7 +27,6 @@
 /* External libs */
 #include <bson.h>
 #include <mongoc.h>
-#include <mongoc-client-private.h>
 
 /* PHP Core stuff */
 #include <php.h>
diff --git a/src/MongoDB/WriteConcern.c b/src/MongoDB/WriteConcern.c
@@ -27,7 +27,6 @@
 /* External libs */
 #include <bson.h>
 #include <mongoc.h>
-#include <mongoc-write-concern-private.h>
 
 /* PHP Core stuff */
 #include <php.h>
diff --git a/src/MongoDB/WriteResult.c b/src/MongoDB/WriteResult.c
@@ -27,7 +27,6 @@
 /* External libs */
 #include <bson.h>
 #include <mongoc.h>
-#include <mongoc-write-concern-private.h>
 
 /* PHP Core stuff */
 #include <php.h>
diff --git a/src/libbson b/src/libbson
@@ -1 +1 @@
-Subproject commit 8d8bf379efbd61fcaa1c22bb4d2cbf0f502ac823
+Subproject commit 2c8673ae1521fa2d65ac8676fb38cb0292c5bae4
diff --git a/src/libmongoc b/src/libmongoc
@@ -1 +1 @@
-Subproject commit 9a31e4c9adc8159ce64d43942b86999eab0eb940
+Subproject commit e38cada1ce5cedeb464c7c611e0506a66bcb1003
