expr: inline private state into 'Excc_t'

Now that `Excc_t` is encapsulated in excc.c and no longer considered an
extensible struct, we can stop playing macro tricks to give it extra fields and
just express these more naturally.

diff --git a/lib/expr/excc.c b/lib/expr/excc.c
index ce767956e514d6ff150b9e2b4dd0b6bf65cfb174..3d648fd45f9f8fce47fa55e6e1d22c246d33d688 100644 (file)
--- a/lib/expr/excc.c
+++ b/lib/expr/excc.c
@@ -15,12 +15,6 @@
  * expression library C program generator
  */
 
-#define _EX_CC_PRIVATE_ \
-       char*           id;             /* prefix + _                   */ \
-       int             lastop;         /* last op                      */ \
-       int             tmp;            /* temp var index               */ \
-       Exccdisc_t*     ccdisc;         /* excc() discipline            */
-
 #include <cgraph/exit.h>
 #include <expr/exlib.h>
 #include <stddef.h>
@@ -43,11 +37,10 @@ struct Excc_s                               /* excc() state                 */
 {
        Expr_t*         expr;           /* exopen() state               */
        Exdisc_t*       disc;           /* exopen() discipline          */
-
-#ifdef _EX_CC_PRIVATE_
-       _EX_CC_PRIVATE_
-#endif
-
+       char*           id;             /* prefix + _                   */
+       int             lastop;         /* last op                      */
+       int             tmp;            /* temp var index               */
+       Exccdisc_t*     ccdisc;         /* excc() discipline            */
 };
 
 #define EX_CC_DUMP     0x8000