CDRIVER-2473 use stdint.h instead of bson-stdint{,-win32}.h

This change applies to non-MSVC compilers/platforms (for bson-stdint.h)
and also to MSVC (for bson-stdint-win32.h). This change only affects
building with CMake.

Author: rcsanchez97

src/libbson/CMakeLists.txt

@@ -142,11 +142,6 @@ configure_file (
    "${PROJECT_BINARY_DIR}/src/bson/bson-version.h"
 )
 
-configure_file (
-   "${PROJECT_SOURCE_DIR}/build/cmake/bson/bson-stdint.h"
-   "${PROJECT_BINARY_DIR}/src/bson/bson-stdint.h"
-)
-
 include_directories ("${PROJECT_BINARY_DIR}/src/bson")
 include_directories ("${PROJECT_SOURCE_DIR}/src/bson")
 include_directories ("${PROJECT_SOURCE_DIR}/src")
@@ -184,7 +179,6 @@ set (SOURCES
 
 set (HEADERS
    ${PROJECT_BINARY_DIR}/src/bson/bson-config.h
-   ${PROJECT_BINARY_DIR}/src/bson/bson-stdint.h
    ${PROJECT_BINARY_DIR}/src/bson/bson-version.h
    ${PROJECT_SOURCE_DIR}/src/bson/bcon.h
    ${PROJECT_SOURCE_DIR}/src/bson/bson-atomic.h
@@ -203,7 +197,6 @@ set (HEADERS
    ${PROJECT_SOURCE_DIR}/src/bson/bson-memory.h
    ${PROJECT_SOURCE_DIR}/src/bson/bson-oid.h
    ${PROJECT_SOURCE_DIR}/src/bson/bson-reader.h
-   ${PROJECT_SOURCE_DIR}/src/bson/bson-stdint-win32.h
    ${PROJECT_SOURCE_DIR}/src/bson/bson-string.h
    ${PROJECT_SOURCE_DIR}/src/bson/bson-types.h
    ${PROJECT_SOURCE_DIR}/src/bson/bson-utf8.h

src/libbson/THIRD_PARTY_NOTICES

@@ -27,40 +27,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-License notice for bson-stdint-win32.h
--------------------------------------------------------------------------------
-
-BSD 3-Clause License
-
-ISO C9x  compliant stdint.h for Microsoft Visual Studio
-Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
-
-Copyright (c) 2006-2013 Alexander Chemeris
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. Neither the name of the product nor the names of its contributors may
-     be used to endorse or promote products derived from this software
-     without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 License notice for b64_pton.h and b64_ntop.h
 -------------------------------------------------------------------------------
 

src/libbson/build/cmake/CMakeLists.txt

@@ -1,5 +1,3 @@
-add_subdirectory (bson)
-
 set (src_libbson_build_cmake_MODULES
    BSONPackage.cmake
 )
@@ -19,6 +17,5 @@ set_local_dist (src_libbson_build_cmake_DIST_local
 
 set (src_libbson_build_cmake_DIST
    ${src_libbson_build_cmake_DIST_local}
-   ${src_libbson_build_cmake_bson_DIST}
    PARENT_SCOPE
 )

src/libbson/build/cmake/bson/CMakeLists.txt

@@ -22,7 +22,6 @@ set (src_libbson_src_bson_DIST_hs
    bson-value.h
    bson-version-functions.h
    bson-writer.h
-   bson-stdint-win32.h
    b64_ntop.h
    b64_pton.h
    bson-private.h
@@ -32,7 +31,6 @@ set (src_libbson_src_bson_DIST_hs
    bson-timegm-private.h
 )
 extra_dist_generated (
-   bson-stdint.h
    bson-version.h
 )
 

src/libbson/build/cmake/bson/bson-stdint.h

@@ -80,14 +80,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <stdint.h>
 
 
 BSON_BEGIN_DECLS
 
 
 #ifdef _MSC_VER
-#include <time.h>
-#include "bson-stdint-win32.h"
 #ifndef __cplusplus
 /* benign redefinition of type */
 #pragma warning(disable : 4142)
@@ -131,7 +130,6 @@ typedef SSIZE_T ssize_t;
 #define PRIu64 "I64u"
 #endif
 #else
-#include "bson-stdint.h"
 #include <inttypes.h>
 #endif