diff options
| author | Zahary Karadjov <zahary@gmail.com> | 2013-01-27 23:41:45 +0200 |
|---|---|---|
| committer | Zahary Karadjov <zahary@gmail.com> | 2013-01-27 23:41:45 +0200 |
| commit | 81a3585872b1a327b62ba528addbee913d6bbe5a (patch) | |
| tree | aff8358bc86704edbd89fd56ec4f7b0cd3583bca /compiler/c2nim | |
| parent | 67f37264b3f461fe46f5cfea7c35c0a4f709dcb0 (diff) | |
| parent | 07585088955c1fe8fb815c40409ed9f5d66fd446 (diff) | |
| download | Nim-81a3585872b1a327b62ba528addbee913d6bbe5a.tar.gz | |
merged upstream master
Diffstat (limited to 'compiler/c2nim')
| -rwxr-xr-x | compiler/c2nim/cpp.nim | 2 | ||||
| -rwxr-xr-x | compiler/c2nim/tests/systest.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/compiler/c2nim/cpp.nim b/compiler/c2nim/cpp.nim index 3b7f58fcc..c210eca3a 100755 --- a/compiler/c2nim/cpp.nim +++ b/compiler/c2nim/cpp.nim @@ -42,6 +42,7 @@ proc parseDefine(p: var TParser): PNode = result = newNodeP(nkTemplateDef, p) getTok(p) addSon(result, skipIdentExport(p)) + addSon(result, ast.emptyNode) eat(p, pxParLe) var params = newNodeP(nkFormalParams, p) # return type; not known yet: @@ -60,6 +61,7 @@ proc parseDefine(p: var TParser): PNode = addSon(result, ast.emptyNode) # no generic parameters addSon(result, params) addSon(result, ast.emptyNode) # no pragmas + addSon(result, ast.emptyNode) var kind = parseDefineBody(p, result) params.sons[0] = newIdentNodeP(kind, p) eatNewLine(p, result) diff --git a/compiler/c2nim/tests/systest.c b/compiler/c2nim/tests/systest.c index 241526e07..2a9dd6c28 100755 --- a/compiler/c2nim/tests/systest.c +++ b/compiler/c2nim/tests/systest.c @@ -17,6 +17,8 @@ int aw_instance_callback_set (AW_CALLBACK c, callback_t callback); unsigned long int wawa; +#define MAX(x, y) ((x) < (y)? (y) : (x)) + #define AW_BUILD 85 // AW 5.0 // Limits #define AW_MAX_AVCHANGE_PER_SECOND 10 |