Skip to content

Fix inttype non-modular header issue when building from an .xcodeproj #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 1, 2020
Merged

Fix inttype non-modular header issue when building from an .xcodeproj #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac2a801
Cleanup .gitignore
kmahar Sep 30, 2020
2bc02d4
Fix inttypes issue (again)
kmahar Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Sources/CLibMongoC/bson/bson-iso8601.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
#include "CLibMongoC_bson-json.h"
#include "bson-timegm-private.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

static bool
get_tok (const char *terminals,
Expand Down
4 changes: 4 additions & 0 deletions Sources/CLibMongoC/bson/bson-json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
#include "CLibMongoC_common-b64-private.h"
#include "jsonsl.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

#ifdef _WIN32
#include <io.h>
#include <share.h>
Expand Down
3 changes: 3 additions & 0 deletions Sources/CLibMongoC/bson/bson.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
#define BSON_MAX_RECURSION 200
#endif

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

typedef enum {
BSON_VALIDATE_PHASE_START,
Expand Down
3 changes: 0 additions & 3 deletions Sources/CLibMongoC/include/CLibMongoC_bson-compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@

BSON_BEGIN_DECLS

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif
#ifdef _MSC_VER
#ifndef __cplusplus
/* benign redefinition of type */
Expand Down
3 changes: 3 additions & 0 deletions Sources/CLibMongoC/mongoc/mongoc-buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
#include "mongoc-buffer-private.h"
#include "mongoc-trace-private.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

#undef MONGOC_LOG_DOMAIN
#define MONGOC_LOG_DOMAIN "buffer"
Expand Down
3 changes: 3 additions & 0 deletions Sources/CLibMongoC/mongoc/mongoc-bulk-operation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
#include "mongoc-opts-private.h"
#include "mongoc-write-command-private.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

/*
* This is the implementation of both write commands and bulk write commands.
Expand Down
4 changes: 4 additions & 0 deletions Sources/CLibMongoC/mongoc/mongoc-change-stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
#include "CLibMongoC_mongoc-error.h"
#include "mongoc-error-private.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

#define CHANGE_STREAM_ERR(_str) \
bson_set_error (&stream->err, \
MONGOC_ERROR_CURSOR, \
Expand Down
4 changes: 4 additions & 0 deletions Sources/CLibMongoC/mongoc/mongoc-client-pool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
#include "mongoc-topology-background-monitoring-private.h"
#include "mongoc-trace-private.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

#ifdef MONGOC_ENABLE_SSL
#include "mongoc-ssl-private.h"
#endif
Expand Down
3 changes: 3 additions & 0 deletions Sources/CLibMongoC/mongoc/mongoc-client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@
#include "mongoc-opts-private.h"
#endif

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

#undef MONGOC_LOG_DOMAIN
#define MONGOC_LOG_DOMAIN "client"
Expand Down
4 changes: 4 additions & 0 deletions Sources/CLibMongoC/mongoc/mongoc-collection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
#include "mongoc-write-command-private.h"
#include "mongoc-error-private.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

#undef MONGOC_LOG_DOMAIN
#define MONGOC_LOG_DOMAIN "collection"

Expand Down
4 changes: 4 additions & 0 deletions Sources/CLibMongoC/mongoc/mongoc-gridfs-bucket-file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
#include "mongoc-stream-gridfs-upload-private.h"
#include "mongoc-collection-private.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

/* Returns the minimum of two numbers */
static size_t
_mongoc_min (const size_t a, const size_t b)
Expand Down
4 changes: 4 additions & 0 deletions Sources/CLibMongoC/mongoc/mongoc-gridfs-bucket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
#include "mongoc-stream-private.h"
#include "mongoc-write-concern-private.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

/*--------------------------------------------------------------------------
*
* _mongoc_gridfs_find_file_with_id --
Expand Down
4 changes: 4 additions & 0 deletions Sources/CLibMongoC/mongoc/mongoc-gridfs-file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
#include "mongoc-trace-private.h"
#include "CLibMongoC_mongoc-error.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

static bool
_mongoc_gridfs_file_refresh_page (mongoc_gridfs_file_t *file);

Expand Down
4 changes: 4 additions & 0 deletions Sources/CLibMongoC/mongoc/mongoc-opts-helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
#include "mongoc-util-private.h"
#include "mongoc-read-concern-private.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

#define BSON_ERR(...) \
do { \
bson_set_error ( \
Expand Down
3 changes: 3 additions & 0 deletions Sources/CLibMongoC/mongoc/mongoc-rpc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
#include "mongoc-compression-private.h"
#include "mongoc-cluster-private.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

#define RPC(_name, _code) \
static void _mongoc_rpc_gather_##_name (mongoc_rpc_##_name##_t *rpc, \
Expand Down
3 changes: 3 additions & 0 deletions Sources/CLibMongoC/mongoc/mongoc-stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
#include "mongoc-trace-private.h"
#include "mongoc-util-private.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

#undef MONGOC_LOG_DOMAIN
#define MONGOC_LOG_DOMAIN "stream"
Expand Down
3 changes: 3 additions & 0 deletions Sources/CLibMongoC/mongoc/mongoc-topology-description.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
#include "mongoc-host-list-private.h"
#include "utlist.h"

#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
#include <inttypes.h>
#endif

static bool
_is_data_node (mongoc_server_description_t *sd)
Expand Down
Loading