Skip to content

Commit 85ffd27

Browse files
committed
Some fixups for PR-151
o We need to pre-include mongoc-config to pick up MONGOC_ENABLE_X o Comment out implementation for b64_pton as well Closes #151
1 parent 62cf2a0 commit 85ffd27

File tree

6 files changed

+14
-0
lines changed

6 files changed

+14
-0
lines changed

src/mongoc/mongoc-b64.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ b64_ntop (uint8_t const *src,
181181
return (int)datalength;
182182
}
183183

184+
#ifdef MONGOC_ENABLE_SSL
185+
184186
/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
185187
The following encoding technique is taken from RFC 1521 by Borenstein
186188
and Freed. It is reproduced here in a slightly edited form for
@@ -515,3 +517,5 @@ b64_pton(char const *src, uint8_t *target, size_t targsize)
515517
else
516518
return b64_pton_len (src);
517519
}
520+
521+
#endif /* MONGOC_ENABLE_SSL */

src/mongoc/mongoc-rand.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
#include "mongoc-config.h"
18+
1719
#ifdef MONGOC_ENABLE_SSL
1820

1921
#include "mongoc-rand.h"

src/mongoc/mongoc-sasl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
#include "mongoc-config.h"
18+
1719
#ifdef MONGOC_ENABLE_SASL
1820

1921
#include <string.h>

src/mongoc/mongoc-scram.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
* limitations under the License.
1414
*/
1515

16+
#include "mongoc-config.h"
17+
1618
#ifdef MONGOC_ENABLE_SSL
1719

1820
#include <string.h>

src/mongoc/mongoc-ssl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
#include "mongoc-config.h"
18+
1719
#ifdef MONGOC_ENABLE_SSL
1820

1921
#include <bson.h>

src/mongoc/mongoc-stream-tls.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
#include "mongoc-config.h"
18+
1719
#ifdef MONGOC_ENABLE_SSL
1820

1921
#include <bson.h>

0 commit comments

Comments
 (0)