diff --git a/tools/qfcc/include/qfcc.h b/tools/qfcc/include/qfcc.h index 71771f366..c0adf073c 100644 --- a/tools/qfcc/include/qfcc.h +++ b/tools/qfcc/include/qfcc.h @@ -60,7 +60,6 @@ typedef struct pr_info_s { struct strpool_s *strings; ///< progs string data struct codespace_s *code; ///< progs code data - struct defspace_s *data; ///< combined near and far data struct defspace_s *near_data; ///< data directly addressable by ///< statments (address < 64k) struct defspace_s *far_data; ///< data that might not be directly diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c index 05d7aa280..10a502e1f 100644 --- a/tools/qfcc/source/qfcc.c +++ b/tools/qfcc/source/qfcc.c @@ -153,8 +153,6 @@ InitData (void) line->fa.func = -1; line->line = -1; - pr.data = defspace_new (); - pr.far_data = defspace_new (); pr.near_data = defspace_new (); diff --git a/tools/qfcc/source/reloc.c b/tools/qfcc/source/reloc.c index 921d20a6f..eb9f731ad 100644 --- a/tools/qfcc/source/reloc.c +++ b/tools/qfcc/source/reloc.c @@ -165,7 +165,9 @@ relocate_refs (reloc_t *reloc, int offset) RELOC (reloc) += offset; break; case rel_def_field_ofs: - RELOC (reloc) += pr.data->data[offset].integer_var; + //FIXME what is correct here? + //RELOC (reloc) += pr.data->data[offset].integer_var; + RELOC (reloc) += pr.near_data->data[offset].integer_var; break; } reloc = reloc->next;