Merge pull request #884

Author: jmikola

contrib/php-ssl.c

@@ -18,6 +18,9 @@
   +----------------------------------------------------------------------+
 */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #ifdef PHP_WIN32
 # include "config.w32.h"

contrib/php-ssl.h

@@ -21,6 +21,10 @@
 #ifndef MONGO_CONTRIB_SSL_H
 #define MONGO_CONTRIB_SSL_H
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #ifdef PHP_WIN32
 # include "config.w32.h"
 #else

io_stream.c

@@ -30,10 +30,6 @@
 # include <php_config.h>
 #endif
 
-#ifdef HAVE_MONGO_OPENSSL
-# include "contrib/php-ssl.h"
-#endif
-
 #include <php.h>
 #include <main/php_streams.h>
 #include <main/php_network.h>
@@ -50,6 +46,10 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_MONGO_OPENSSL
+# include "contrib/php-ssl.h"
+#endif
+
 #if HAVE_MONGO_SASL
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>