===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ox.h,v
retrieving revision 1.8
retrieving revision 1.12
diff -u -p -r1.8 -r1.12
--- OpenXM_contrib2/asir2000/include/ox.h	2000/08/22 05:04:15	1.8
+++ OpenXM_contrib2/asir2000/include/ox.h	2001/08/20 09:03:26	1.12
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/include/ox.h,v 1.7 2000/08/21 08:31:36 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ox.h,v 1.11 2001/06/15 07:56:05 noro Exp $ 
 */
 #include "com.h"
 
@@ -134,6 +134,7 @@
 #define SM_executeStringByLocalParserInBatchMode 274
 #define SM_getsp 275
 #define SM_dupErrors 276
+#define SM_pushCMOtag 277
 
 #define SM_nop 300
 
@@ -146,9 +147,9 @@ typedef FILE *ox_stream;
 /* a macro to check whether data are available in the read buffer */
 #if defined(linux)
 #define FP_DATA_IS_AVAILABLE(fp) ((fp)->_IO_read_ptr < (fp)->_IO_read_end)
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || (defined(__MACH__) && defined(__ppc__))
 #define FP_DATA_IS_AVAILABLE(fp) ((fp)->_r)
-#elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips)
+#elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips) || defined(_IBMR2)
 #define FP_DATA_IS_AVAILABLE(fp) ((fp)->_cnt)
 #elif defined(VISUAL)
 #define FP_DATA_IS_AVAILABLE(fp) ((fp)->p < (fp)->buf_size)
@@ -160,7 +161,7 @@ typedef FILE *ox_stream;
 
 extern jmp_buf environnement;
 
-extern jmp_buf env;
+extern jmp_buf main_env;
 extern int *StackBottom;
 extern int ox_do_copy, ox_do_count, ox_count_length;
 extern char *ox_copy_bptr;