1.1 --- a/generator.py Mon Feb 27 14:44:30 2017 +0100
1.2 +++ b/generator.py Mon Feb 27 14:52:11 2017 +0100
1.3 @@ -564,7 +564,7 @@
1.4 # Define a macro for the constant.
1.5
1.6 attr_name = encode_path(const_path)
1.7 - print >>f_decls, "#define %s ((__attr) {.value=&%s})" % (attr_name, structure_name)
1.8 + print >>f_decls, "#define %s __ATTRVALUE(&%s)" % (attr_name, structure_name)
1.9
1.10 def make_parameter_table(self, f_decls, f_defs, argmin, parameters):
1.11
1.12 @@ -1180,14 +1180,14 @@
1.13 }
1.14 __Catch(__tmp_exc)
1.15 {
1.16 - if (__ISINSTANCE(__tmp_exc.arg, ((__attr) {.value=&__builtins___exception_system_SystemExit})))
1.17 + if (__ISINSTANCE(__tmp_exc.arg, __ATTRVALUE(&__builtins___exception_system_SystemExit)))
1.18 return __load_via_object(
1.19 __load_via_object(__tmp_exc.arg.value, %s).value,
1.20 %s).intvalue;
1.21
1.22 fprintf(stderr, "Program terminated due to exception: %%s.\\n",
1.23 __load_via_object(
1.24 - %s((__attr[]) {__NULL, __tmp_exc.arg}).value,
1.25 + %s(__ARGS(__NULL, __tmp_exc.arg)).value,
1.26 %s).strvalue);
1.27 return 1;
1.28 }