Merge pull request #263 from ksuarz/CDRIVER-593-strcasecmp

CDRIVER-593 strcasecmp

Author: ajdavis

src/mongoc/mongoc-cluster.c

@@ -56,10 +56,6 @@
 #define MONGOC_LOG_DOMAIN "cluster"
 
 
-#ifdef _WIN32
-# define strcasecmp _stricmp
-#endif
-
 #define MIN_WIRE_VERSION 0
 #define MAX_WIRE_VERSION 3
 

src/mongoc/mongoc-cursor.c

@@ -23,17 +23,13 @@
 #include "mongoc-log.h"
 #include "mongoc-opcode.h"
 #include "mongoc-trace.h"
+#include "mongoc-util-private.h"
 
 
 #undef MONGOC_LOG_DOMAIN
 #define MONGOC_LOG_DOMAIN "cursor"
 
 
-#ifdef _WIN32
-# define strcasecmp _stricmp
-#endif
-
-
 static const char *gSecondaryOkCommands [] = {
    "aggregate",
    "authenticate",

src/mongoc/mongoc-host-list.c

@@ -15,11 +15,7 @@
  */
 
 #include "mongoc-host-list.h"
-
-
-#ifdef _WIN32
-# define strcasecmp _stricmp
-#endif
+#include "mongoc-util-private.h"
 
 /*
  *--------------------------------------------------------------------------

src/mongoc/mongoc-sasl.c

@@ -22,16 +22,13 @@
 
 #include "mongoc-error.h"
 #include "mongoc-sasl-private.h"
+#include "mongoc-util-private.h"
 
 
 #ifndef SASL_CALLBACK_FN
 #  define SASL_CALLBACK_FN(_f) ((int (*) (void))(_f))
 #endif
 
-#if defined(_WIN32) && !defined(strcasecmp)
-# define strcasecmp _stricmp
-#endif
-
 void
 _mongoc_sasl_set_mechanism (mongoc_sasl_t *sasl,
                             const char    *mechanism)

src/mongoc/mongoc-server-description.c

@@ -20,6 +20,7 @@
 #include "mongoc-server-description-private.h"
 #include "mongoc-trace.h"
 #include "mongoc-uri.h"
+#include "mongoc-util-private.h"
 
 #include <stdio.h>
 
@@ -29,11 +30,6 @@
 #define ALPHA 0.2
 
 
-#if defined(_WIN32) && !defined(strcasecmp)
-# define strcasecmp _stricmp
-#endif
-
-
 static uint8_t kMongocEmptyBson[] = { 5, 0, 0, 0, 0 };
 
 /* Destroy allocated resources within @description, but don't free it */

src/mongoc/mongoc-ssl.c

@@ -34,11 +34,7 @@
 #include "mongoc-ssl-private.h"
 #include "mongoc-trace.h"
 #include "mongoc-thread-private.h"
-
-#ifdef _WIN32
-# define strncasecmp _strnicmp
-# define strcasecmp  _stricmp
-#endif
+#include "mongoc-util-private.h"
 
 /* TODO: we could populate these from a config or something further down the
  * road for providing defaults */

src/mongoc/mongoc-topology-description.c

@@ -19,11 +19,7 @@
 #include "mongoc-server-description-private.h"
 #include "mongoc-topology-description-private.h"
 #include "mongoc-trace.h"
-
-
-#if defined(_WIN32) && !defined(strcasecmp)
-# define strcasecmp _stricmp
-#endif
+#include "mongoc-util-private.h"
 
 
 static void

src/mongoc/mongoc-uri.c

@@ -26,14 +26,10 @@
 #include "mongoc-log.h"
 #include "mongoc-socket.h"
 #include "mongoc-uri-private.h"
+#include "mongoc-util-private.h"
 #include "mongoc-write-concern-private.h"
 
 
-#if defined(_WIN32) && !defined(strcasecmp)
-# define strcasecmp _stricmp
-#endif
-
-
 struct _mongoc_uri_t
 {
    char                   *str;

src/mongoc/mongoc-util-private.h

@@ -33,6 +33,12 @@
       } \
    } while (0)
 
+/* string comparison functions for Windows */
+#ifdef _WIN32
+# define strcasecmp  _stricmp
+# define strncasecmp _strnicmp
+#endif
+
 BSON_BEGIN_DECLS