[rkward-cvs] rkward/rkward/rbackend rembedinternal.cpp,1.36,1.37

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/rbackend
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv511/rkward/rbackend

Modified Files:
	rembedinternal.cpp 
Log Message:
More adjustments for R 2.3.0

Index: rembedinternal.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rembedinternal.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** rembedinternal.cpp	11 Apr 2006 15:43:19 -0000	1.36
--- rembedinternal.cpp	11 Apr 2006 16:48:14 -0000	1.37
***************
*** 43,51 ****
  // some functions we need that are not declared
  extern int Rf_initEmbeddedR(int argc, char **argv);
- typedef void *HINSTANCE;
- extern int addDLL (char *path, char *name, HINSTANCE *handle);
  extern SEXP R_ParseVector(SEXP, int, ParseStatus*);
  extern void Rf_PrintWarnings (void);
- extern int R_CollectWarnings;
  extern int R_interrupts_pending;
  extern Rboolean R_Visible;
--- 43,48 ----
***************
*** 318,328 ****
  
  SEXP doError (SEXP call) {
! 	extern int R_ShowErrorMessages;
! 	if (R_ShowErrorMessages) {
! 		int count;
! 		char **strings = extractStrings (call, &count);
! 		REmbedInternal::this_pointer->handleError (strings, count);
! 		deleteStrings (strings, count);
! 	}
  	return R_NilValue;
  }
--- 315,323 ----
  
  SEXP doError (SEXP call) {
! 	int count;
! 	char **strings = extractStrings (call, &count);
! 	REmbedInternal::this_pointer->handleError (strings, count);
! 	deleteStrings (strings, count);
! 
  	return R_NilValue;
  }
***************
*** 434,440 ****
  	Rprintf ("");
  
! 	if (R_CollectWarnings) {
! 		Rf_PrintWarnings ();
! 	}
  
  //	SET_SYMVALUE(R_LastvalueSymbol, exp);
--- 429,433 ----
  	Rprintf ("");
  
! 	Rf_PrintWarnings ();
  
  //	SET_SYMVALUE(R_LastvalueSymbol, exp);
***************
*** 490,497 ****
  		Rprintf ("");
  
! 		if (R_CollectWarnings) {
! 			Rf_PrintWarnings ();
! 		}
! 	} 
  }
  
--- 483,488 ----
  		Rprintf ("");
  
! 		Rf_PrintWarnings ();
! 	}
  }