Skip to content

Commit

Permalink
not yet
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.r-project.org/R/trunk@87681 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information
ripley committed Feb 3, 2025
1 parent 042176e commit b106aff
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
17 changes: 4 additions & 13 deletions src/include/R_ext/Boolean.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* R : A Computer Language for Statistical Data Analysis
* Copyright (C) 2000, 2025 The R Core Team.
* Copyright (C) 2000, 2001 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
Expand Down Expand Up @@ -29,22 +29,13 @@
#undef FALSE
#undef TRUE

// Fer now, only when the compiler claims to be a C23 compiler.

#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
typedef bool Rboolean;
# define FALSE false
# define TRUE true
# define _R_RBOOLEAN_IS_BOOL_ 1
#else
# ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
# endif
#endif
typedef enum { FALSE = 0, TRUE /*, MAYBE */ } Rboolean;

# ifdef __cplusplus
#ifdef __cplusplus
}
# endif
#endif

#endif /* R_EXT_BOOLEAN_H_ */
3 changes: 1 addition & 2 deletions src/include/R_ext/RStartup.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ typedef struct
R_SIZE_T max_vsize;
R_SIZE_T max_nsize;
R_SIZE_T ppsize;
// This used to be Rboolean, but that is not guaraneteed to have >= 16 bits
int NoRenviron : 16;
Rboolean NoRenviron : 16;
/* RstartVersion has been added in R 4.2.0. Earlier, NoRenviron was an
int (normally 32-bit like Rboolean), so on most machines the
version would become 0 when setting NoRenviron to FALSE in
Expand Down

0 comments on commit b106aff

Please sign in to comment.