Skip to content

Commit b106aff

Browse files
author
ripley
committed
not yet
git-svn-id: https://svn.r-project.org/R/trunk@87681 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 042176e commit b106aff

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

src/include/R_ext/Boolean.h

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* R : A Computer Language for Statistical Data Analysis
3-
* Copyright (C) 2000, 2025 The R Core Team.
3+
* Copyright (C) 2000, 2001 The R Core Team.
44
*
55
* This header file is free software; you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
@@ -29,22 +29,13 @@
2929
#undef FALSE
3030
#undef TRUE
3131

32-
// Fer now, only when the compiler claims to be a C23 compiler.
33-
34-
#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
35-
typedef bool Rboolean;
36-
# define FALSE false
37-
# define TRUE true
38-
# define _R_RBOOLEAN_IS_BOOL_ 1
39-
#else
40-
# ifdef __cplusplus
32+
#ifdef __cplusplus
4133
extern "C" {
42-
# endif
34+
#endif
4335
typedef enum { FALSE = 0, TRUE /*, MAYBE */ } Rboolean;
4436

45-
# ifdef __cplusplus
37+
#ifdef __cplusplus
4638
}
47-
# endif
4839
#endif
4940

5041
#endif /* R_EXT_BOOLEAN_H_ */

src/include/R_ext/RStartup.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ typedef struct
7373
R_SIZE_T max_vsize;
7474
R_SIZE_T max_nsize;
7575
R_SIZE_T ppsize;
76-
// This used to be Rboolean, but that is not guaraneteed to have >= 16 bits
77-
int NoRenviron : 16;
76+
Rboolean NoRenviron : 16;
7877
/* RstartVersion has been added in R 4.2.0. Earlier, NoRenviron was an
7978
int (normally 32-bit like Rboolean), so on most machines the
8079
version would become 0 when setting NoRenviron to FALSE in

0 commit comments

Comments
 (0)