[nasm:master] preproc: Reorder ExpInv to drop padding

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  d57a031616b97b9ebf77bccc5660394eb9b572c8
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=d57a031616b97b9ebf77bccc5660394eb9b572c8
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 17 Jul 2011 20:11:08 +0400
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 17 Jul 2011 20:11:08 +0400

preproc: Reorder ExpInv to drop padding

Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 preproc.c |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/preproc.c b/preproc.c
index 9173d9a..f5d0fd1 100644
--- a/preproc.c
+++ b/preproc.c
@@ -243,24 +243,25 @@ struct ExpDef {
  * `paramlen', `rotate' and `unique' are local to the invocation.
  */
 struct ExpInv {
-    ExpInv *prev;               /* previous invocation */
-    enum pp_exp_type type;      /* expansion type */
-    ExpDef *def;                /* pointer to expansion definition */
-    char *name;                 /* invocation name */
-    Line *label;                /* pointer to label */
-    char *label_text;           /* pointer to label text */
-    Line *current;              /* pointer to current line in invocation */
-
-    Token **params;             /* actual parameters */
-    Token *iline;               /* invocation line */
-    unsigned int nparam, rotate;
-    int *paramlen;
-
-    uint64_t unique;
-    bool emitting;
-    int lineno;                 /* current line number in expansion */
-    int linnum;                 /* line number at invocation */
-    int relno;                  /* relative line number at invocation */
+    ExpInv              *prev;          /* previous invocation */
+    ExpDef              *def;           /* pointer to expansion definition */
+    char                *name;          /* invocation name */
+    Line                *label;         /* pointer to label */
+    char                *label_text;    /* pointer to label text */
+    Line                *current;       /* pointer to current line in invocation */
+
+    Token               **params;       /* actual parameters */
+    Token               *iline;         /* invocation line */
+    int                 *paramlen;
+    unsigned int        nparam;
+    unsigned int        rotate;
+
+    uint64_t            unique;
+    int                 lineno;         /* current line number in expansion */
+    int                 linnum;         /* line number at invocation */
+    int                 relno;          /* relative line number at invocation */
+    enum pp_exp_type    type;           /* expansion type */
+    bool                emitting;
 };
 
 /*