Define USE_BASE_R_SUPPORT in Defn.h an use to mask some non-API declarations.

Also comment out declaration for rnbeta, which does not exist.


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

Author: luke

src/appl/uncmin.c

@@ -27,6 +27,7 @@
 
 /*--- The Dennis + Schnabel Minimizer -- used by R's  nlm() ---*/
 
+#define USE_BASE_R_SUPPORT
 #include <math.h>
 #include <float.h> /* DBL_MAX */
 #include <R_ext/Boolean.h>

src/include/Defn.h

@@ -23,6 +23,9 @@
 #ifndef DEFN_H_
 #define DEFN_H_
 
+// enable some non-API declarations in R_ext includes
+#define USE_BASE_R_SUPPORT
+
 /* seems unused */
 #define COUNTING
 

src/include/R_ext/Applic.h

@@ -121,9 +121,11 @@ void F77_NAME(dqrls)(double *x, int *n, int *p, double *y, int *ny,
 /* appl/pretty.c: for use in engine.c and util.c
    FIXME: move out of this header
 */
+#ifdef USE_BASE_R_SUPPORT
 double R_pretty(double *lo, double *up, int *ndiv, int min_n,
 		double shrink_sml, const double high_u_fact[],
 		int eps_correction, int return_bounds);
+#endif
 
 /* For use in package stats */
 
@@ -135,9 +137,11 @@ typedef void (*fcn_p)(int, double *, double *, void *);
 /* type of pointer to the hessian functions */
 typedef void (*d2fcn_p)(int, int, double *, double *, void *);
 
+#ifdef USE_BASE_R_SUPPORT
 void fdhess(int n, double *x, double fval, fcn_p fun, void *state,
 	    double *h, int nfd, double *step, double *f, int ndigit,
 	    double *typx);
+#endif
 
 /* Also used in packages nlme, pcaPP */
 void optif9(int nr, int n, double *x,

src/include/R_ext/Error.h

@@ -58,13 +58,17 @@ extern "C" {
 [[noreturn]] void Rf_error(const char *, ...) R_PRINTF_FORMAT(1, 2);
 
 [[noreturn]] void UNIMPLEMENTED(const char *);
+#ifdef USE_BASE_R_SUPPORT
 [[noreturn]] void WrongArgCount(const char *);
+#endif
 #else
 NORET void Rf_error(const char *, ...) R_PRINTF_FORMAT(1, 2);
 
 NORET void UNIMPLEMENTED(const char *);
+#ifdef USE_BASE_R_SUPPORT
 NORET void WrongArgCount(const char *);
 #endif
+#endif
 
 void Rf_warning(const char *, ...) R_PRINTF_FORMAT(1,2);
 

src/include/R_ext/Memory.h

@@ -45,7 +45,9 @@ void*	vmaxget(void); // not remapped
 void	vmaxset(const void *); // not re-mapped
 
 void	R_gc(void);
+#ifdef USE_BASE_R_SUPPORT
 int	R_gc_running(void);
+#endif
 
 char*	R_alloc(R_SIZE_T, int);
 long double *R_allocLD(R_SIZE_T nelem);

src/include/R_ext/Rdynload.h

@@ -86,7 +86,9 @@ Rboolean R_useDynamicSymbols(DllInfo *info, Rboolean value);
 Rboolean R_forceSymbols(DllInfo *info, Rboolean value);
 
 /* Not API */
+#ifdef USE_BASE_R_SUPPORT
 DllInfo *R_getDllInfo(const char *name);
+#endif
 
 /* To be used by applications embedding R to register their symbols
    that are not related to any dynamic module/

src/include/R_ext/eventloop.h

@@ -75,13 +75,16 @@ typedef struct _InputHandler {
 extern InputHandler *addInputHandler(InputHandler *handlers, int fd, InputHandlerProc handler, int activity);
 extern InputHandler *getInputHandler(InputHandler *handlers, int fd);
 extern int           removeInputHandler(InputHandler **handlers, InputHandler *it);
+
+#ifdef USE_BASE_R_SUPPORT
 extern InputHandler *getSelectedHandler(InputHandler *handlers, fd_set *mask);
 extern fd_set *R_checkActivity(int usec, int ignore_stdin);
 extern void R_runHandlers(InputHandler *handlers, fd_set *mask);
 
 extern int R_SelectEx(int  n,  fd_set  *readfds,  fd_set  *writefds,
 		      fd_set *exceptfds, struct timeval *timeout,
 		      void (*intr)(void));
+#endif
 
 #ifdef __SYSTEM__
 #ifndef __cplusplus   /* Would get duplicate conflicting symbols*/

src/include/Rmath.h0.in

@@ -540,7 +540,7 @@ double	rlogis(double, double);
 double	dnbeta(double, double, double, double, int);
 double	pnbeta(double, double, double, double, int, int);
 double	qnbeta(double, double, double, double, int, int);
-double	rnbeta(double, double, double);
+//double	rnbeta(double, double, double);
 
 	/* Non-central F Distribution */
 

src/modules/internet/Rsock.c

@@ -184,6 +184,7 @@ void in_Rsockwrite(int *sockp, char **buf, int *start, int *end, int *len)
 struct hostent *R_gethostbyname(const char *name);
 
 #ifdef Unix
+#define USE_BASE_R_SUPPORT
 #include <R_ext/eventloop.h>
 
 /* modified from src/unix/sys-std.c  */