Fixed lots of warning and made code compatible with C89 and ANSI with -pedantic.

[pforth] / csrc / pf_guts.h

diff --git a/csrc/pf_guts.h b/csrc/pf_guts.h
index acb92a6..80df530 100644 (file)
--- a/csrc/pf_guts.h
+++ b/csrc/pf_guts.h
@@ -429,9 +429,7 @@ typedef struct pfDictionary_s
        ucell_t dic_HeaderPtr;\r
        ucell_t dic_HeaderLimit;\r
 /* Code segment contains tokenized code and data. */\r
        ucell_t dic_HeaderPtr;\r
        ucell_t dic_HeaderLimit;\r
 /* Code segment contains tokenized code and data. */\r

-\r

        ucell_t dic_CodeBaseUnaligned;\r
        ucell_t dic_CodeBaseUnaligned;\r

-\r

        ucell_t dic_CodeBase;\r
        union\r
        {\r
        ucell_t dic_CodeBase;\r
        union\r
        {\r


@@ -552,15 +550,15 @@ extern cell_t         gIncludeIndex;
 #define IN_DICS(addr) (IN_CODE_DIC(addr) || IN_NAME_DIC(addr))\r
 \r
 /* Address conversion */\r
 #define IN_DICS(addr) (IN_CODE_DIC(addr) || IN_NAME_DIC(addr))\r
 \r
 /* Address conversion */\r

-#define ABS_TO_NAMEREL( a ) ((cell_t)  (((uint8_t *) a) - NAME_BASE ))\r
-#define ABS_TO_CODEREL( a ) ((cell_t)  (((uint8_t *) a) - CODE_BASE ))\r
-#define NAMEREL_TO_ABS( a ) ((char *) (((cell_t) a) + NAME_BASE))\r
-#define CODEREL_TO_ABS( a ) ((cell_t *) (((cell_t) a) + CODE_BASE))\r
+#define ABS_TO_NAMEREL( a ) ((cell_t)  (((ucell_t) a) - NAME_BASE ))\r
+#define ABS_TO_CODEREL( a ) ((cell_t)  (((ucell_t) a) - CODE_BASE ))\r
+#define NAMEREL_TO_ABS( a ) ((ucell_t) (((cell_t) a) + NAME_BASE))\r
+#define CODEREL_TO_ABS( a ) ((ucell_t) (((cell_t) a) + CODE_BASE))\r

 \r
 /* The check for >0 is only needed for CLONE testing. !!! */\r
 #define IsTokenPrimitive(xt) ((xt<gNumPrimitives) && (xt>=0))\r
 \r
 \r
 /* The check for >0 is only needed for CLONE testing. !!! */\r
 #define IsTokenPrimitive(xt) ((xt<gNumPrimitives) && (xt>=0))\r
 \r

-#define FREE_VAR(v) { if (v) { pfFreeMem(v); v = NULL; } }\r
+#define FREE_VAR(v) { if (v) { pfFreeMem((void *)(v)); v = 0; } }\r

 \r
 #define DATA_STACK_DEPTH (gCurrentTask->td_StackBase - gCurrentTask->td_StackPtr)\r
 #define DROP_DATA_STACK (gCurrentTask->td_StackPtr++)\r
 \r
 #define DATA_STACK_DEPTH (gCurrentTask->td_StackBase - gCurrentTask->td_StackPtr)\r
 #define DROP_DATA_STACK (gCurrentTask->td_StackPtr++)\r