Merge branch 'master' into build64

[pforth] / csrc / pf_guts.h

diff --git a/csrc/pf_guts.h b/csrc/pf_guts.h
index 709b537..3c5a4cf 100644 (file)
--- a/csrc/pf_guts.h
+++ b/csrc/pf_guts.h
@@ -23,7 +23,7 @@
 ** PFORTH_VERSION changes when PForth is modified and released.
 ** See README file for version info.
 */
 ** PFORTH_VERSION changes when PForth is modified and released.
 ** See README file for version info.
 */

-#define PFORTH_VERSION "27"
+#define PFORTH_VERSION "28"

 
 /*
 ** PFORTH_FILE_VERSION changes when incompatible changes are made
 
 /*
 ** PFORTH_FILE_VERSION changes when incompatible changes are made


@@ -36,8 +36,9 @@
 ** FV7 - 971203 - Added ID_FILL, (1LOCAL@),  etc., ran out of reserved, resorted.
 ** FV8 - 980818 - Added Endian flag.
 ** FV9 - 20100503 - Added support for 64-bit CELL.
 ** FV7 - 971203 - Added ID_FILL, (1LOCAL@),  etc., ran out of reserved, resorted.
 ** FV8 - 980818 - Added Endian flag.
 ** FV9 - 20100503 - Added support for 64-bit CELL.

+** FV10 - 20170103 - Added ID_FILE_FLUSH ID_FILE_RENAME ID_FILE_RESIZE

 */
 */

-#define PF_FILE_VERSION (9)   /* Bump this whenever primitives added. */
+#define PF_FILE_VERSION (10)   /* Bump this whenever primitives added. */

 #define PF_EARLIEST_FILE_VERSION (9)  /* earliest one still compatible */
 
 /***************************************************************
 #define PF_EARLIEST_FILE_VERSION (9)  /* earliest one still compatible */
 
 /***************************************************************


@@ -461,7 +462,7 @@ typedef struct IncludeFrame
 extern "C" {
 #endif
 
 extern "C" {
 #endif
 

-int pfCatch( ExecToken XT );
+ThrowCode pfCatch( ExecToken XT );

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }


@@ -570,9 +571,12 @@ extern cell_t         gIncludeIndex;
 /* Force Quad alignment. */
 #define QUADUP(x) (((x)+3)&~3)
 
 /* Force Quad alignment. */
 #define QUADUP(x) (((x)+3)&~3)
 

+#ifndef MIN

 #define MIN(a,b)  ( ((a)<(b)) ? (a) : (b) )
 #define MIN(a,b)  ( ((a)<(b)) ? (a) : (b) )

+#endif
+#ifndef MAX

 #define MAX(a,b)  ( ((a)>(b)) ? (a) : (b) )
 #define MAX(a,b)  ( ((a)>(b)) ? (a) : (b) )

-
+#endif

 
 #ifndef TOUCH
     #define TOUCH(argument) ((void)argument)
 
 #ifndef TOUCH
     #define TOUCH(argument) ((void)argument)