Assorted fixes for win32

missing mongoc-rand.c in cmakelists.txt
missing some symbols from *.def files

Author: hanumantmk

CMakeLists.txt

@@ -129,9 +129,12 @@ set (HEADERS
 
 if (OPENSSL_FOUND)
    set (HEADERS ${HEADERS}
+      ${SOURCE_DIR}/src/mongoc/mongoc-rand.h
       ${SOURCE_DIR}/src/mongoc/mongoc-stream-tls.h
       ${SOURCE_DIR}/src/mongoc/mongoc-ssl.h)
    set (SOURCES ${SOURCES}
+      ${SOURCE_DIR}/src/mongoc/mongoc-rand.c
+      ${SOURCE_DIR}/src/mongoc/mongoc-scram.c
       ${SOURCE_DIR}/src/mongoc/mongoc-stream-tls.c
       ${SOURCE_DIR}/src/mongoc/mongoc-ssl.c
    )
@@ -250,6 +253,7 @@ add_test(NAME test-libmongoc COMMAND test-libmongoc -f -p)
 
 mongoc_add_example(example-gridfs TRUE ${SOURCE_DIR}/examples/example-gridfs.c)
 mongoc_add_example(example-client TRUE ${SOURCE_DIR}/examples/example-client.c)
+mongoc_add_example(example-scram TRUE ${SOURCE_DIR}/examples/example-scram.c)
 mongoc_add_example(mongoc-dump TRUE ${SOURCE_DIR}/examples/mongoc-dump.c)
 mongoc_add_example(mongoc-ping TRUE ${SOURCE_DIR}/examples/mongoc-ping.c)
 mongoc_add_example(mongoc-rpc-validate FALSE ${SOURCE_DIR}/examples/mongoc-rpc-validate.c)

build/cmake/libmongoc-ssl.def

@@ -23,6 +23,8 @@ mongoc_client_get_collection
 mongoc_client_get_database
 mongoc_client_get_database_names
 mongoc_client_get_gridfs
+mongoc_client_get_max_bson_size
+mongoc_client_get_max_message_size
 mongoc_client_get_read_prefs
 mongoc_client_get_server_status
 mongoc_client_get_uri
@@ -129,13 +131,21 @@ mongoc_gridfs_find_one_by_filename
 mongoc_gridfs_get_chunks
 mongoc_gridfs_get_files
 mongoc_gridfs_remove_by_filename
+mongoc_index_opt_geo_get_default
+mongoc_index_opt_geo_init
 mongoc_index_opt_get_default
 mongoc_index_opt_init
 mongoc_init
 mongoc_log
 mongoc_log_default_handler
 mongoc_log_level_str
 mongoc_log_set_handler
+mongoc_matcher_destroy
+mongoc_matcher_match
+mongoc_matcher_new
+mongoc_rand_add
+mongoc_rand_seed
+mongoc_rand_status
 mongoc_read_prefs_add_tag
 mongoc_read_prefs_copy
 mongoc_read_prefs_destroy
@@ -145,7 +155,6 @@ mongoc_read_prefs_is_valid
 mongoc_read_prefs_new
 mongoc_read_prefs_set_mode
 mongoc_read_prefs_set_tags
-mongoc_ssl_opt_get_default
 mongoc_socket_accept
 mongoc_socket_bind
 mongoc_socket_close
@@ -160,6 +169,7 @@ mongoc_socket_recv
 mongoc_socket_send
 mongoc_socket_sendv
 mongoc_socket_setsockopt
+mongoc_ssl_opt_get_default
 mongoc_stream_buffered_new
 mongoc_stream_close
 mongoc_stream_destroy

build/cmake/libmongoc.def

@@ -23,8 +23,8 @@ mongoc_client_get_collection
 mongoc_client_get_database
 mongoc_client_get_database_names
 mongoc_client_get_gridfs
-mongoc_client_get_max_message_size
 mongoc_client_get_max_bson_size
+mongoc_client_get_max_message_size
 mongoc_client_get_read_prefs
 mongoc_client_get_server_status
 mongoc_client_get_uri
@@ -138,6 +138,12 @@ mongoc_log
 mongoc_log_default_handler
 mongoc_log_level_str
 mongoc_log_set_handler
+mongoc_matcher_destroy
+mongoc_matcher_match
+mongoc_matcher_new
+mongoc_rand_add
+mongoc_rand_seed
+mongoc_rand_status
 mongoc_read_prefs_add_tag
 mongoc_read_prefs_copy
 mongoc_read_prefs_destroy
@@ -180,8 +186,10 @@ mongoc_uri_copy
 mongoc_uri_destroy
 mongoc_uri_get_auth_mechanism
 mongoc_uri_get_auth_source
+mongoc_uri_get_credentials
 mongoc_uri_get_database
 mongoc_uri_get_hosts
+mongoc_uri_get_mechanism_properties
 mongoc_uri_get_options
 mongoc_uri_get_password
 mongoc_uri_get_read_prefs

src/mongoc/mongoc-rand.c

@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
+#include "mongoc-rand.h"
+#include "mongoc-rand-private.h"
 
-#include "mongoc-config.h"
+#include "mongoc.h"
 
 #include <openssl/rand.h>
 
-#include "mongoc-rand.h"
-#include "mongoc-rand-private.h"
-
 int _mongoc_rand_bytes(uint8_t * buf, int num) {
     return RAND_bytes(buf, num);
 }