Skip to content

Commit 262938f

Browse files
author
ripley
committed
_R_USE_STRICT_R_HEADERS_ is no longer needed
git-svn-id: https://svn.r-project.org/R/trunk@87313 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent c145971 commit 262938f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/library/tools/R/check.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7297,7 +7297,7 @@ add_dummies <- function(dir, Log)
72977297
Sys.setenv("_R_CHECK_MBCS_CONVERSION_FAILURE_" = "TRUE")
72987298
Sys.setenv("_R_CHECK_VALIDATE_UTF8_" = "TRUE")
72997299
Sys.setenv("_R_CXX_USE_NO_REMAP_" = "TRUE")
7300-
Sys.setenv("_R_USE_STRICT_R_HEADERS_" = "TRUE")
7300+
## Sys.setenv("_R_USE_STRICT_R_HEADERS_" = "TRUE")
73017301
Sys.setenv("_R_CHECK_S3_METHODS_SHOW_POSSIBLE_ISSUES_" = "TRUE")
73027302
Sys.setenv("_R_CHECK_XREFS_NOTE_MISSING_PACKAGE_ANCHORS_" = "TRUE")
73037303
R_check_vc_dirs <- TRUE

src/library/tools/R/install.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2764,8 +2764,8 @@ if(FALSE) {
27642764
)
27652765
if(config_val_to_logical(Sys.getenv("_R_CXX_USE_NO_REMAP_", "FALSE")))
27662766
makeargs <- c(makeargs, "CXX_DEFS=-DR_NO_REMAP")
2767-
if(config_val_to_logical(Sys.getenv("_R_USE_STRICT_R_HEADERS_", "FALSE")))
2768-
makeargs <- c(makeargs, "XDEFS=-DSTRICT_R_HEADERS=1")
2767+
## if(config_val_to_logical(Sys.getenv("_R_USE_STRICT_R_HEADERS_", "FALSE")))
2768+
## makeargs <- c(makeargs, "XDEFS=-DSTRICT_R_HEADERS=1")
27692769

27702770
cmd <- paste(MAKE, p1(paste("-f", shQuote(makefiles))), p1(makeargs),
27712771
p1(makeobjs))

0 commit comments

Comments
 (0)