Skip to content

Commit 333d192

Browse files
author
ripley
committed
define STRICT_R_HEADERS for a package that assume this
git-svn-id: https://svn.r-project.org/R/trunk@87316 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 8a696f0 commit 333d192

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

doc/NEWS.Rd

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,14 @@
244244
always includes header \file{float.h} or \file{cfloat} for
245245
constants such as \code{DBL_MAX}
246246

247-
\item Defining \file{STRICT_R_HEADERS} is now the default. This
248-
removes the legacy definitions of \code{PI}, \code{Calloc},
249-
\code{Realloc} and \code{Free}: use \code{M_PI}, \code{R_Calloc},
250-
\code{R_Realloc} or \code{R_Free} instead.
247+
\item Strict R headers are now the default. This removes the
248+
legacy definitions of \code{PI}, \code{Calloc}, \code{Realloc} and
249+
\code{Free}: use \code{M_PI}, \code{R_Calloc}, \code{R_Realloc} or
250+
\code{R_Free} instead.
251+
252+
\emph{Pro tem} \code{STRICT_R_HEADERS} is defined in header
253+
\file{R_ext/RS.h} if not already defined. This is not used in \R
254+
itself and will be removed before release.
251255

252256
\item The deprecated S-compatibility macros \code{F77_COM} and
253257
\code{F77_COMDECL} have been removed from header \file{R_ext/RS.h}.

src/include/R_ext/RS.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@
3838

3939
#include <Rconfig.h> /* for HAVE_F77_UNDERSCORE */
4040

41+
/* Temprorary fix for a package that assumes this is set. */
42+
43+
#ifndef STRICT_R_HEADERS
44+
# define STRICT_R_HEADERS
45+
#endif
46+
4147
#ifdef __cplusplus
4248
extern "C" {
4349
#endif

0 commit comments

Comments
 (0)