Changeset: 6768e9cd39ed for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6768e9cd39ed Added Files: tools/embedded/undef.h Modified Files: configure.ag Branch: embedded Log Message:
undefs diffs (46 lines): diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -3508,21 +3508,7 @@ typedef lng ptrdiff_t; /* These are required to make MonetDB's source tree CRAN-compliant */ #ifdef HAVE_EMBEDDED_R -extern FILE* embedded_stdout; -extern FILE* embedded_stderr; - -#define exit(status) ((void) (status)) -#undef assert -#define NDEBUG 1 -#define assert(ignore) ((void) 0) -#undef stdout -#define stdout embedded_stdout -#undef stderr -#define stderr embedded_stderr - -#define srand(seed) ((void) (seed)) -extern int embedded_r_rand(void); -#define rand embedded_r_rand +#include "tools/embedded/undef.h" #endif #endif /* _SEEN_MONETDB_CONFIG_H */ diff --git a/tools/embedded/undef.h b/tools/embedded/undef.h new file mode 100644 --- /dev/null +++ b/tools/embedded/undef.h @@ -0,0 +1,15 @@ +extern FILE* embedded_stdout; +extern FILE* embedded_stderr; + +#define exit(status) ((void) (status)) +#undef assert +#define NDEBUG 1 +#define assert(ignore) ((void) 0) +#undef stdout +#define stdout embedded_stdout +#undef stderr +#define stderr embedded_stderr + +#define srand(seed) ((void) (seed)) +extern int embedded_r_rand(void); +#define rand embedded_r_rand _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
