diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2022-11-22 22:44:25 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-11-23 06:18:47 +0000 |
| commit | 0250aea7589466821087e7afc3735d16f606c700 (patch) | |
| tree | 1c54b7d6f30b727effa132288c653e3a38a47a62 | |
| parent | 0485466386507f0a7378f802ad2aafa2e1ccc4c1 (diff) | |
| download | mongo-0250aea7589466821087e7afc3735d16f606c700.tar.gz | |
SERVER-71317 Fix libmongocrypt build
| -rw-r--r-- | src/third_party/libmongocrypt/SConscript | 4 | ||||
| -rw-r--r-- | src/third_party/libmongocrypt/dist/src/mc-range-encoding.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/third_party/libmongocrypt/SConscript b/src/third_party/libmongocrypt/SConscript index f7ffb3f8771..0399f1a8a4e 100644 --- a/src/third_party/libmongocrypt/SConscript +++ b/src/third_party/libmongocrypt/SConscript @@ -55,13 +55,13 @@ if env.TargetOSIs('windows'): # Disable warnings about deprecated functions env.Append(CFLAGS=['/wd4996']) elif env.TargetOSIs('darwin'): - env.Append(CPPDEFINES=['KMS_MESSAGE_ENABLE_CRYPTO_COMMON_CRYPTO']) + env.Append(CPPDEFINES=['KMS_MESSAGE_ENABLE_CRYPTO_COMMON_CRYPTO', 'MLIB_HAVE_STRINGS_H']) additional_sources.append([ 'dist/kms-message/src/kms_crypto_apple.c', 'dist/src/crypto/commoncrypto.c', ]) else: - env.Append(CPPDEFINES=['KMS_MESSAGE_ENABLE_CRYPTO_LIBCRYPTO']) + env.Append(CPPDEFINES=['KMS_MESSAGE_ENABLE_CRYPTO_LIBCRYPTO', 'MLIB_HAVE_STRINGS_H']) additional_sources.append([ 'dist/kms-message/src/kms_crypto_libcrypto.c', 'dist/src/crypto/libcrypto.c', diff --git a/src/third_party/libmongocrypt/dist/src/mc-range-encoding.c b/src/third_party/libmongocrypt/dist/src/mc-range-encoding.c index 689ec0b9754..7d5ee083504 100644 --- a/src/third_party/libmongocrypt/dist/src/mc-range-encoding.c +++ b/src/third_party/libmongocrypt/dist/src/mc-range-encoding.c @@ -28,7 +28,7 @@ /* Enable -Wconversion as error for only this file. * Other libmongocrypt files warn for -Wconversion. */ -MC_BEGIN_CONVERSION_ERRORS +// MC_BEGIN_CONVERSION_ERRORS /** * Encode a signed 32-bit integer as an unsigned 32-bit integer by adding 2^31. @@ -226,4 +226,4 @@ mc_getTypeInfoDouble (mc_getTypeInfoDouble_args_t args, return true; } -MC_END_CONVERSION_ERRORS +// MC_END_CONVERSION_ERRORS |