cleanup and a little more win32 compat

Removing bson_*_t types.  Providing a shim for stdint instead

some more win32 compat where needed

bindings/python/cbson-dbref.c

@@ -229,7 +229,7 @@ cbson_dbref_new (const char       *collection,
 PyTypeObject *
 cbson_dbref_get_type (void)
 {
-   static bson_bool_t initialized;
+   static bool initialized;
 
    if (!initialized) {
       cbson_dbref_type.tp_new = cbson_dbref_tp_new;
@@ -238,7 +238,7 @@ cbson_dbref_get_type (void)
       if (PyType_Ready(&cbson_dbref_type) < 0) {
          return NULL;
       }
-      initialized = TRUE;
+      initialized = true;
    }
 
    return &cbson_dbref_type;

bindings/python/cbson-oid.c

@@ -111,7 +111,7 @@ cbson_oid_from_datetime (PyObject *obj,
                          PyObject *args)
 {
    cbson_oid_t *ret;
-   bson_int32_t t;
+   int32_t t;
    PyObject *dt;
 
    if (!PyArg_ParseTuple(args, "O", &dt)) {
@@ -234,7 +234,7 @@ cbson_oid_get_generation_time (PyObject *obj,
                                void     *data)
 {
    cbson_oid_t *oid = (cbson_oid_t *)obj;
-   bson_int64_t gentime;
+   int64_t gentime;
    PyObject *ret;
 
    gentime = bson_oid_get_time_t(&oid->oid);
@@ -280,7 +280,7 @@ cbson_oid_tp_new (PyTypeObject *self,
 
       switch (len) {
       case 12:
-         bson_oid_init_from_data(&oid, (const bson_uint8_t *)str);
+         bson_oid_init_from_data(&oid, (const uint8_t *)str);
          break;
       case 24:
          if (!bson_oid_is_valid(str, len)) {
@@ -328,7 +328,7 @@ cbson_oid_new (const bson_oid_t *oid)
 PyTypeObject *
 cbson_oid_get_type (bson_context_t *context)
 {
-   static bson_bool_t initialized;
+   static bool initialized;
 
    if (!initialized) {
       gContext = context;
@@ -338,7 +338,7 @@ cbson_oid_get_type (bson_context_t *context)
       if (PyType_Ready(&cbson_oid_type) < 0) {
          return NULL;
       }
-      initialized = TRUE;
+      initialized = true;
    }
 
    return &cbson_oid_type;

bindings/python/cbson-util.c

@@ -32,7 +32,7 @@ typedef struct
 } cbson_fixed_offset_t;
 
 
-static bson_bool_t gUseFixedOffset;
+static bool gUseFixedOffset;
 static PyTypeObject cbson_fixed_offset_type = {
    PyObject_HEAD_INIT(NULL)
    0,                         /*ob_size*/
@@ -171,7 +171,7 @@ static PyMethodDef cbson_fixed_offset_tp_methods[] = {
 PyTypeObject *
 cbson_fixed_offset_get_type (void)
 {
-   static bson_bool_t initialized;
+   static bool initialized;
 
    if (!initialized) {
 #define SET(n, v) cbson_fixed_offset_type.n = v
@@ -183,11 +183,11 @@ cbson_fixed_offset_get_type (void)
       SET(tp_compare, cbson_fixed_offset_tp_compare);
 
       if (PyType_Ready(&cbson_fixed_offset_type) < 0) {
-         assert(FALSE);
+         assert(false);
          return NULL;
       }
 
-      initialized = TRUE;
+      initialized = true;
 
 #undef SET
    }
@@ -196,34 +196,34 @@ cbson_fixed_offset_get_type (void)
 }
 
 
-bson_bool_t
+bool
 cbson_util_init (PyObject *module)
 {
    PyDateTime_IMPORT;
 
    if (!PyDateTimeAPI) {
-      return FALSE;
+      return false;
    }
 
    PyModule_AddObject(module, "FixedOffset",
                       (PyObject *)cbson_fixed_offset_get_type());
 
-   return TRUE;
+   return true;
 }
 
 
-bson_bool_t
+bool
 cbson_date_time_check (PyObject *object)
 {
    return PyDateTime_Check(object);
 }
 
 
 PyObject *
-cbson_date_time_from_msec (bson_int64_t msec_since_epoch)
+cbson_date_time_from_msec (int64_t msec_since_epoch)
 {
-   bson_int32_t diff;
-   bson_int32_t microseconds;
+   int32_t diff;
+   int32_t microseconds;
    struct TM timeinfo;
    Time64_T seconds;
    PyObject *ret;
@@ -295,10 +295,10 @@ cbson_date_time_from_msec (bson_int64_t msec_since_epoch)
 }
 
 
-bson_int32_t
+int32_t
 cbson_date_time_seconds (PyObject *date_time)
 {
-   bson_int32_t val = -1;
+   int32_t val = -1;
    PyObject *calendar;
    PyObject *ret;
    PyObject *timegm_;
@@ -378,7 +378,7 @@ cbson_fixed_offset_utc_ref (void)
 
 
 void
-cbson_set_use_fixed_offset (bson_bool_t use_fixed_offset)
+cbson_set_use_fixed_offset (bool use_fixed_offset)
 {
    gUseFixedOffset = use_fixed_offset;
 }

bindings/python/cbson-util.h

@@ -30,11 +30,11 @@
 BSON_BEGIN_DECLS
 
 
-void          cbson_set_use_fixed_offset (bson_bool_t   use_fixed_offset);
-PyObject     *cbson_date_time_from_msec  (bson_int64_t  msec_since_epoch);
-bson_int32_t  cbson_date_time_seconds    (PyObject     *date_time);
-bson_bool_t   cbson_util_init            (PyObject     *module);
-bson_bool_t   cbson_date_time_check      (PyObject     *object);
+void          cbson_set_use_fixed_offset (bool   use_fixed_offset);
+PyObject     *cbson_date_time_from_msec  (int64_t  msec_since_epoch);
+int32_t  cbson_date_time_seconds    (PyObject     *date_time);
+bool   cbson_util_init            (PyObject     *module);
+bool   cbson_date_time_check      (PyObject     *object);
 PyObject     *cbson_fixed_offset_utc_ref (void);