CDRIVER-500 get rid of non-prefixed macros

Namespace MAX, MIN and ABS from libbson.  None of those should have been
going out over public headers, so we roll that back.

This is a small source compatibility break.

Author: hanumantmk

src/libbson

@@ -84,13 +84,13 @@ mongoc_client_pool_new (const mongoc_uri_t *uri)
 
    if (bson_iter_init_find_case(&iter, b, "minpoolsize")) {
       if (BSON_ITER_HOLDS_INT32(&iter)) {
-         pool->min_pool_size = MAX(0, bson_iter_int32(&iter));
+         pool->min_pool_size = BSON_MAX(0, bson_iter_int32(&iter));
       }
    }
 
    if (bson_iter_init_find_case(&iter, b, "maxpoolsize")) {
       if (BSON_ITER_HOLDS_INT32(&iter)) {
-         pool->max_pool_size = MAX(1, bson_iter_int32(&iter));
+         pool->max_pool_size = BSON_MAX(1, bson_iter_int32(&iter));
       }
    }
 

src/mongoc/mongoc-client-pool.c

@@ -113,7 +113,7 @@ mongoc_counters_calc_size (void)
            (n_cpu * n_groups * sizeof(mongoc_counter_slots_t)));
 
 #ifdef BSON_OS_UNIX
-   return MAX(getpagesize(), size);
+   return BSON_MAX(getpagesize(), size);
 #else
    return size;
 #endif

src/mongoc/mongoc-counters.c

@@ -89,7 +89,7 @@ _mongoc_n_return (mongoc_cursor_t * cursor)
       uint32_t remaining = cursor->limit - cursor->count;
 
       /* use min of batch or remaining */
-      r = MIN(r, (int32_t)remaining);
+      r = BSON_MIN(r, (int32_t)remaining);
    }
 
    return r;

src/mongoc/mongoc-cursor.c

@@ -79,7 +79,7 @@ _mongoc_gridfs_file_page_read (mongoc_gridfs_file_page_t *page,
    BSON_ASSERT (page);
    BSON_ASSERT (dst);
 
-   bytes_read = MIN (len, page->len - page->offset);
+   bytes_read = BSON_MIN (len, page->len - page->offset);
 
    src = page->read_buf ? page->read_buf : page->buf;
 
@@ -112,17 +112,17 @@ _mongoc_gridfs_file_page_write (mongoc_gridfs_file_page_t *page,
    BSON_ASSERT (page);
    BSON_ASSERT (src);
 
-   bytes_written = MIN (len, page->chunk_size - page->offset);
+   bytes_written = BSON_MIN (len, page->chunk_size - page->offset);
 
    if (!page->buf) {
       page->buf = bson_malloc (page->chunk_size);
-      memcpy (page->buf, page->read_buf, MIN (page->chunk_size, page->len));
+      memcpy (page->buf, page->read_buf, BSON_MIN (page->chunk_size, page->len));
    }
 
    memcpy (page->buf + page->offset, src, bytes_written);
    page->offset += bytes_written;
 
-   page->len = MAX (page->offset, page->len);
+   page->len = BSON_MAX (page->offset, page->len);
 
    RETURN (bytes_written);
 }

src/mongoc/mongoc-gridfs-file-page.c

@@ -490,7 +490,7 @@ mongoc_gridfs_file_writev (mongoc_gridfs_file_t *file,
          file->pos += r;
          bytes_written += r;
 
-         file->length = MAX (file->length, (int64_t)file->pos);
+         file->length = BSON_MAX (file->length, (int64_t)file->pos);
 
          if (iov_pos == iov[i].iov_len) {
             /** filled a bucket, keep going */

src/mongoc/mongoc-gridfs-file.c

@@ -1123,7 +1123,7 @@ _mongoc_write_result_merge (mongoc_write_result_t  *result,  /* IN */
           * XXX: The following addition to nMatched needs some checking.
           *      I'm highly skeptical of it.
           */
-         result->nMatched += MAX (0, (affected - n_upserted));
+         result->nMatched += BSON_MAX (0, (affected - n_upserted));
       } else {
          result->nMatched += affected;
       }

src/mongoc/mongoc-write-command.c

@@ -115,7 +115,7 @@ main (int   argc,
    }
 
    if (argc > 2) {
-      count = MAX(atoi(argv[2]), 1);
+      count = BSON_MAX(atoi(argv[2]), 1);
    }
 
    pool = mongoc_client_pool_new(uri);