Skip to content

Commit 68b72db

Browse files
author
luke
committed
Moved declarations of non-API functions R_popen and R_system to Defn.h.
git-svn-id: https://svn.r-project.org/R/trunk@89058 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent e337fcf commit 68b72db

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

src/include/Defn.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,6 +1789,16 @@ Rboolean R_checkConstants(Rboolean);
17891789
Rboolean R_BCVersionOK(SEXP);
17901790
int R_NaN_is_R_NA(double);
17911791

1792+
/* Replacements for popen and system */
1793+
#ifdef HAVE_POPEN
1794+
# ifdef __cplusplus
1795+
std::FILE *R_popen(const char *, const char *);
1796+
# else
1797+
FILE *R_popen(const char *, const char *);
1798+
# endif
1799+
#endif
1800+
int R_system(const char *);
1801+
17921802
/* Environment and Binding Features */
17931803
SEXP R_FindPackageEnv(SEXP info);
17941804
Rboolean R_HasFancyBindings(SEXP rho); // envir.c

src/include/Rinternals.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -835,16 +835,6 @@ void R_ReleaseFromMSet(SEXP x, SEXP mset);
835835
void R_dot_Last(void); /* in main.c */
836836
void R_RunExitFinalizers(void); /* in memory.c */
837837

838-
/* Replacements for popen and system */
839-
#ifdef HAVE_POPEN
840-
# ifdef __cplusplus
841-
std::FILE *R_popen(const char *, const char *);
842-
# else
843-
FILE *R_popen(const char *, const char *);
844-
# endif
845-
#endif
846-
int R_system(const char *);
847-
848838
/* R_compute_identical: C version of identical() function
849839
The third arg to R_compute_identical() consists of bitmapped flags for non-default options:
850840
currently the first 4 default to TRUE, so the flag is set for FALSE values:

src/library/tools/R/sotools.R

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,11 @@ nonAPI <- c("chol_", "chol2inv_", "cg_", "ch_", "rg_",
707707
## experimental resizable vector entry points -- not yet in the API
708708
"R_isResizable", "R_maxLength", "R_resizeVector",
709709
"R_allocResizableVector", "R_duplicateAsResizable",
710+
## experimental hashtable support -- not yet in the API
711+
"R_asHashtable", "R_HashtabSEXP", "R_isHashtable", "R_mkhashtab",
712+
"R_gethash", "R_sethash", "R_remhash", "R_numhash", "R_typhash",
713+
"R_maphash", "R_maphashC", "R_clrhash",
714+
710715
## in the experimental API header R_ext/Connections.h
711716
## "R_new_custom_connection", "R_ReadConnection",
712717
## "R_WriteConnection", "R_GetConnection",

0 commit comments

Comments
 (0)