Index: tools/autogen.py
===================================================================
--- tools/autogen.py	(revision 4be73ba2544fcfad829cc03bac95ab5135d899d4)
+++ tools/autogen.py	(revision 32e3cdfc8986d9f6c67d7e98cd10bf6ffa0720ef)
@@ -55,6 +55,7 @@
 	for i in range(len(struct['members'])):
 		member = struct['members'][i]
-		code = code + ("\temit_constant(OFFSET_%s, offsetof(%s_t, %s));\n" % 
-		    (member['name'].upper(), struct['name'], member['name']))
+		code = code + ("\temit_constant(%s_OFFSET_%s, offsetof(%s_t, %s));\n" % 
+		    (struct['name'].upper(), member['name'].upper(), struct['name'],
+		    member['name']))
 	return code