===================================================================
RCS file: /home/cvs/OpenXM/src/hgm/oxprint/oxprint.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- OpenXM/src/hgm/oxprint/oxprint.h	2016/02/13 02:23:39	1.4
+++ OpenXM/src/hgm/oxprint/oxprint.h	2017/04/01 12:01:25	1.5
@@ -1,8 +1,13 @@
-#define oxprintf(...)  printf(__VA_ARGS__)
-#define oxprintfe(...) fprintf(stderr,__VA_ARGS__)
-#define oxflush()  fflush(NULL)
-#define oxabort()  abort()
-#define oxstdout  stdout
-#define oxstdin   stdin
-#define oxexit(a) exit(a)
-#define oxexit0(a) exit(a)
+#include <R.h>
+#include <R_ext/Utils.h>
+#include <R_ext/Print.h>
+#include <Rinternals.h>
+#include <R_ext/Rdynload.h>
+#define oxprintf(...)  Rprintf(__VA_ARGS__)
+#define oxprintfe(...) REprintf(__VA_ARGS__)
+#define oxflush()  
+#define oxabort()  error("Fatal error in the shared lib hgm.\n")
+#define oxstdout  NULL
+#define oxstdin  NULL
+#define oxexit(a)  error("Fatal error in the shared lib hgm.\n");
+#define oxexit0(a)  error("Fatal error in the shared lib hgm.\n");