Changeset 58775d30 in mainline for tools/autogen.py

Timestamp:

2015-03-16T16:07:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2003739

Parents:

6069061 (diff), 795e2bf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes

File:

• tools/autogen.py (modified) (5 diffs)

tools/autogen.py

@@ -66 +66 @@
         for i in range(len(struct['members'])):
                 member = struct['members'][i]
-                code = code + ("\temit_constant(%s_OFFSET_%s, offsetof(%s_t, %s));\n" % 
+                code = code + ("\temit_constant(%s_OFFSET_%s, offsetof(%s_t, %s));\n" %
                     (struct['name'].upper(), member['name'].upper(), struct['name'],
                     member['name']))
-                code = code + ("\temit_constant(%s_SIZE_%s, sizeof(((%s_t *) 0)->%s));\n" % 
+                code = code + ("\temit_constant(%s_SIZE_%s, sizeof(((%s_t *) 0)->%s));\n" %
                     (struct['name'].upper(), member['name'].upper(), struct['name'],
                     member['name']))
                 if 'elements' in member.keys():
-                        code = code + ("\temit_constant(%s_%s_ITEM_SIZE, sizeof(%s));\n" % 
+                        code = code + ("\temit_constant(%s_%s_ITEM_SIZE, sizeof(%s));\n" %
                             (struct['name'].upper(), member['name'].upper(), member['type']))
                         
@@ -83 +83 @@
 
         code = """
-%s              
+%s
 
 #define str(s) #s
@@ -92 +92 @@
 %s
 
-int main()
+extern int main(int, char *[]);
+
+int main(int argc, char *argv[])
 {
 %s
@@ -100 +102 @@
         """ % (generate_includes(struct), generate_struct(struct),
             generate_probes(struct), name.upper(), typename)
-
+        
         return code
 
@@ -167 +169 @@
 
 run()
-