X-Git-Url: http://git.subgeniuskitty.com/pforth/.git/blobdiff_plain/9190005e32c6151b76ac707b30eeb4d5d9dd1d36..c1a87b8298475c3fdd007b14a1413d2a6fd0fa61:/csrc/pf_guts.h

diff --git a/csrc/pf_guts.h b/csrc/pf_guts.h
index 5aa4a70..3c5a4cf 100644
--- a/csrc/pf_guts.h
+++ b/csrc/pf_guts.h
@@ -462,7 +462,7 @@ typedef struct IncludeFrame
 extern "C" {
 #endif
 
-int pfCatch( ExecToken XT );
+ThrowCode pfCatch( ExecToken XT );
 
 #ifdef __cplusplus
 }
@@ -571,9 +571,12 @@ extern cell_t         gIncludeIndex;
 /* Force Quad alignment. */
 #define QUADUP(x) (((x)+3)&~3)
 
+#ifndef MIN
 #define MIN(a,b)  ( ((a)<(b)) ? (a) : (b) )
+#endif
+#ifndef MAX
 #define MAX(a,b)  ( ((a)>(b)) ? (a) : (b) )
-
+#endif
 
 #ifndef TOUCH
     #define TOUCH(argument) ((void)argument)