Commit 91cc1399 authored by Gabor Greif's avatar Gabor Greif 💬 Committed by Simon Marlow
Browse files

tidied this up, the macro definitions were causing duplicate semis in the source

parent 7a61f477
......@@ -29,9 +29,9 @@
------------------------------------------------------------------------- */
#if x86_64_TARGET_ARCH
#define OFFSET_FIELD(n) StgHalfInt n; StgHalfWord __pad_##n;
#define OFFSET_FIELD(n) StgHalfInt n; StgHalfWord __pad_##n
#else
#define OFFSET_FIELD(n) StgInt n;
#define OFFSET_FIELD(n) StgInt n
#endif
/* -----------------------------------------------------------------------------
......@@ -196,7 +196,7 @@ typedef union {
#ifndef TABLES_NEXT_TO_CODE
StgLargeBitmap* large_bitmap; /* pointer to large bitmap structure */
#else
OFFSET_FIELD( large_bitmap_offset ); /* offset from info table to large bitmap structure */
OFFSET_FIELD(large_bitmap_offset); /* offset from info table to large bitmap structure */
#endif
StgWord selector_offset; /* used in THUNK_SELECTORs */
......@@ -255,12 +255,12 @@ typedef struct StgInfoTable_ {
-------------------------------------------------------------------------- */
typedef struct StgFunInfoExtraRev_ {
OFFSET_FIELD ( slow_apply_offset ); /* apply to args on the stack */
OFFSET_FIELD(slow_apply_offset); /* apply to args on the stack */
union {
StgWord bitmap;
OFFSET_FIELD ( bitmap_offset ); /* arg ptr/nonptr bitmap */
OFFSET_FIELD(bitmap_offset); /* arg ptr/nonptr bitmap */
} b;
OFFSET_FIELD ( srt_offset ); /* pointer to the SRT table */
OFFSET_FIELD(srt_offset); /* pointer to the SRT table */
StgHalfWord fun_type; /* function type */
StgHalfWord arity; /* function arity */
} StgFunInfoExtraRev;
......@@ -299,7 +299,7 @@ extern StgWord stg_arg_bitmaps[];
typedef struct {
#if defined(TABLES_NEXT_TO_CODE)
OFFSET_FIELD( srt_offset ); /* offset to the SRT table */
OFFSET_FIELD(srt_offset); /* offset to the SRT table */
StgInfoTable i;
#else
StgInfoTable i;
......@@ -321,7 +321,7 @@ typedef struct StgThunkInfoTable_ {
StgInfoTable i;
#endif
#if defined(TABLES_NEXT_TO_CODE)
OFFSET_FIELD( srt_offset ); /* offset to the SRT table */
OFFSET_FIELD(srt_offset); /* offset to the SRT table */
#else
StgSRT *srt; /* pointer to the SRT table */
#endif
......@@ -340,8 +340,8 @@ typedef struct StgConInfoTable_ {
#endif
#if defined(TABLES_NEXT_TO_CODE)
OFFSET_FIELD(con_desc) // the name of the data constructor
// as: Package:Module.Name
OFFSET_FIELD(con_desc); // the name of the data constructor
// as: Package:Module.Name
#else
char *con_desc;
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment