diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2014-12-17 13:23:51 +0100 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2014-12-17 13:23:51 +0100 |
| commit | a80705575b12c9813d6a7ecf92bb33aedd10b09e (patch) | |
| tree | 0b260d771fcd5aef702f3389769a6dae65b8e9bf /test/regression/decl1.c | |
| parent | e86596ae60132b0821cb8b15409074e4cd76243a (diff) | |
| parent | c1daedb244d1f7586c12749642b0d78ae910e60a (diff) | |
| download | compcert-a80705575b12c9813d6a7ecf92bb33aedd10b09e.tar.gz compcert-a80705575b12c9813d6a7ecf92bb33aedd10b09e.zip | |
Merge branch 'master' into dwarf
Conflicts:
powerpc/PrintAsm.ml
Diffstat (limited to 'test/regression/decl1.c')
| -rw-r--r-- | test/regression/decl1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/regression/decl1.c b/test/regression/decl1.c index d2aedba7..6049b4af 100644 --- a/test/regression/decl1.c +++ b/test/regression/decl1.c @@ -10,7 +10,7 @@ int f (int p) int main (int argc, char **argv) { - int (*p)(); + int (*p)(int); int f(); int i; |