make STRICT_R_HEADERS the default

git-svn-id: https://svn.r-project.org/R/trunk@87312 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: ripley

doc/NEWS.Rd

@@ -241,14 +241,13 @@
       string.  This is one step for \PR{18297}; from \I{Henrik Bengtsson}.
 
       \item Header \file{R_ext/Constants.h} (included by \file{R.h}) now
-      includes header \file{float.h} or \file{cfloat} for constants such
-      as \code{DBL_MAX} even if \file{STRICT_R_HEADERS} is defined.
-
-      \item It is intended that \file{STRICT_R_HEADERS} will become the
-      default prior to release.  This will remove the legacy definitions
-      of \code{PI}, \code{Calloc}, \code{Realloc} and \code{Free}: use
-      \code{M_PI}, \code{R_Calloc}, \code{R_Realloc} or \code{R_Free}
-      instead.
+      always includes header \file{float.h} or \file{cfloat} for
+      constants such as \code{DBL_MAX}
+
+      \item Defining \file{STRICT_R_HEADERS} is now the default.  This
+      removes the legacy definitions of \code{PI}, \code{Calloc},
+      \code{Realloc} and \code{Free}: use \code{M_PI}, \code{R_Calloc},
+      \code{R_Realloc} or \code{R_Free} instead.
 
       \item The deprecated S-compatibility macros \code{F77_COM} and
       \code{F77_COMDECL} have been removed from header \file{R_ext/RS.h}.

doc/manual/R-exts.texi

@@ -14999,9 +14999,7 @@ Memory obtained by these macros should be aligned in the same way as
 @apifun Free
 @c The R_ forms were introduced in 2016-09, hence for R 3.4.0
 Historically the macros @code{Calloc}, @code{Free} and @code{Realloc}
-were used, and these remain available unless @code{STRICT_R_HEADERS}
-was defined prior to the inclusion of the header, but these are likely to
-be removed in the near future.
+were used but have been removed in \R 4.5.0.
 
 @code{R_Calloc}, @code{R_Realloc}, and @code{R_Free} are currently
 implemented as macros expanding to calls to @code{R_chk_calloc},
@@ -16131,11 +16129,11 @@ natural logarithm (@code{log(x)} in @R{}).
 @end quotation
 
 @apihdr R_ext/Constants.h
-For compatibility with @Sl{} this file defines the constant @code{PI}
-(unless @code{STRICT_R_HEADERS} is defined): this is deprecated and
-should be replaced by @code{M_PI}.  Header @file{Constants.h} includes
-either C header @file{float.h} or C++ header @file{cfloat}, which
-provide constants such as @code{DBL_MAX}.
+For compatibility with @Sl{} this file used to define the constant
+@code{PI} this is defunct and should be replaced by @code{M_PI}.
+Header @file{Constants.h} includes either C header @file{float.h} or
+C++ header @file{cfloat}, which provide constants such as
+@code{DBL_MAX}.
 
 @apivar TRUE
 @apivar FALSE

src/include/R.h

@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 2000-2022 The R Core Team.
+ *  Copyright (C) 2000-2024 The R Core Team.
  *
  *  This header file is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
@@ -69,7 +69,7 @@
 #include <R_ext/Arith.h>      /* R_FINITE, ISNAN, ... */
 #include <R_ext/Boolean.h>    /* Rboolean type */
 #include <R_ext/Complex.h>    /* Rcomplex type */
-#include <R_ext/Constants.h>  /* M_PI; DOUBLE_EPS, etc unless STRICT_R_HEADERS */
+#include <R_ext/Constants.h>  /* M_PI; DOUBLE_EPS, etc */
 #include <R_ext/Error.h>      /* error and warning */
 #include <R_ext/Memory.h>     /* R_alloc and S_alloc */
 #include <R_ext/Print.h>      /* Rprintf etc */

src/include/R_ext/Constants.h

@@ -43,9 +43,10 @@
 # include <float.h>  /* Defines the RHSs, C99 and later */
 #endif
 
-#ifndef STRICT_R_HEADERS
+/* #ifndef STRICT_R_HEADERS
 # define PI             M_PI
 #endif
+*/
 
 /* The DOUBLE_* defines were deprecated in R 4.2.0 and removed in 4.3.0.
 #define DOUBLE_DIGITS  DBL_MANT_DIG

src/include/R_ext/Error.h

@@ -72,7 +72,7 @@ void R_ShowMessage(const char *s);
 */
 #ifdef HAVE_F77_UNDERSCORE
 /* F77_NAME is in RS.h, but better not include it here (e.g. due to
- * name conflicts involving symbols defined with !STRICT_R_HEADERS) .
+ * previous name conflicts involving symbols defined with !STRICT_R_HEADERS) .
  * However, using a trailing underline is not universal, and print.c
  * uses F77_SUB.
  */

src/include/R_ext/RS.h

@@ -51,15 +51,6 @@ extern void R_chk_free(void *);
 extern void *R_chk_memcpy(void *, const void *, R_SIZE_T);
 extern void *R_chk_memset(void *, int, R_SIZE_T);
 
-#ifndef STRICT_R_HEADERS
-/* S-PLUS 3.x but not 5.x NULLed the pointer in Free.
-   Not API.
-*/
-#define Calloc(n, t)   (t *) R_chk_calloc( (R_SIZE_T) (n), sizeof(t) )
-#define Realloc(p,n,t) (t *) R_chk_realloc( (void *)(p), (R_SIZE_T)((n) * sizeof(t)) )
-#define Free(p)        (R_chk_free( (void *)(p) ), (p) = NULL)
-#endif
-
 /* API */
 #define R_Calloc(n, t)   (t *) R_chk_calloc( (R_SIZE_T) (n), sizeof(t) )
 #define R_Realloc(p,n,t) (t *) R_chk_realloc( (void *)(p), (R_SIZE_T)((n) * sizeof(t)) )

src/library/tools/src/gramLatex.c

@@ -71,7 +71,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996, 1997  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2022  The R Core Team
+ *  Copyright (C) 1997--2024  The R Core Team
  *  Copyright (C) 2010 Duncan Murdoch
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -96,9 +96,6 @@
 #define R_USE_SIGNALS 1
 #include <Defn.h>
 #include <Parse.h>
-#ifndef STRICT_R_HEADERS
-# define STRICT_R_HEADERS
-#endif
 #include <R_ext/RS.h>           /* for R_chk_* allocation */
 #include <ctype.h>
 #include <R_ext/Print.h>

src/library/tools/src/gramLatex.y

@@ -3,7 +3,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 1995, 1996, 1997  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1997--2022  The R Core Team
+ *  Copyright (C) 1997--2024  The R Core Team
  *  Copyright (C) 2010 Duncan Murdoch
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -28,9 +28,6 @@
 #define R_USE_SIGNALS 1
 #include <Defn.h>
 #include <Parse.h>
-#ifndef STRICT_R_HEADERS
-# define STRICT_R_HEADERS
-#endif
 #include <R_ext/RS.h>           /* for R_chk_* allocation */
 #include <ctype.h>
 #include <R_ext/Print.h>

src/library/tools/src/gramRd.c

@@ -95,9 +95,6 @@
 #define R_USE_SIGNALS 1
 #include <Defn.h>
 #include <Parse.h>
-#ifndef STRICT_R_HEADERS
-# define STRICT_R_HEADERS
-#endif
 #include <R_ext/RS.h>           /* for R_chk_* allocation */
 #include <ctype.h>
 #include <Rmath.h> /* for imax2(.),..*/

src/library/tools/src/gramRd.y

@@ -27,9 +27,6 @@
 #define R_USE_SIGNALS 1
 #include <Defn.h>
 #include <Parse.h>
-#ifndef STRICT_R_HEADERS
-# define STRICT_R_HEADERS
-#endif
 #include <R_ext/RS.h>           /* for R_chk_* allocation */
 #include <ctype.h>
 #include <Rmath.h> /* for imax2(.),..*/