Skip to content

Commit

Permalink
Workaround 32-bit legacy Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
jeroen committed Jan 28, 2025
1 parent 4f6d011 commit b058e69
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
config:
- {os: macos-13, r: 'release'}
- {os: macos-14, r: 'release'}
- {os: windows-latest, r: '4.1'}
- {os: windows-latest, r: '4.2'}
- {os: windows-latest, r: '4.3'}
- {os: windows-latest, r: 'release'}
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Description: High-performance MongoDB client based on 'mongo-c-driver' and 'json
Includes support for aggregation, indexing, map-reduce, streaming, encryption,
enterprise authentication, and GridFS. The online user manual provides an overview
of the available methods in the package: <https://jeroen.github.io/mongolite/>.
Version: 3.0.0
Version: 3.0.1
Authors@R: c(
person("Jeroen", "Ooms", ,"[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-4035-0289")),
Expand Down
4 changes: 2 additions & 2 deletions src/Makevars.win
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ PKG_CPPFLAGS = \
-DMONGOC_ENABLE_SSL_SECURE_CHANNEL -DMONGOC_ENABLE_CRYPTO_CNG \
-DKMS_MESSAGE_ENABLE_CRYPTO -DKMS_MESSAGE_ENABLE_CRYPTO_CNG \
-DMONGOC_HAVE_SASL_CLIENT_DONE -D__USE_MINGW_ANSI_STDIO \
-DKMS_MESSAGE_LITTLE_ENDIAN -DUTF8PROC_STATIC \
-DMONGOC_HAVE_BCRYPT_PBKDF2
-DKMS_MESSAGE_LITTLE_ENDIAN -DUTF8PROC_STATIC


PKG_LIBS = \
-L. -Lmongoc -lstatmongoc \
Expand Down
6 changes: 6 additions & 0 deletions src/mongoc/mongoc-config.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@
# undef MONGOC_HAVE_DNSAPI
#endif


/* This did not work on 32-bit windows in R 4.1 */
#ifdef _WIN64
#define MONGOC_HAVE_BCRYPT_PBKDF2
#endif

/*
* MONGOC_HAVE_RES_NSEARCH is set from configure to determine if we
* have thread-safe res_nsearch().
Expand Down

0 comments on commit b058e69

Please sign in to comment.