Changeset 795e2bf in mainline for tools/autogen.py

Timestamp:

2015-03-15T15:31:49Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0e4c5f0, 58775d30, eec5795

Parents:

c12f891

Message:

revive clang support
generate autotool and autogen probe sources in a more compatible manner
cstyle fixes

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()
-