Fix more ifdef issues

dlang · Jul 30, 2013 · 829e18e · 829e18e
1 parent 4203c06
commit 829e18e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/ctfeexpr.c b/src/ctfeexpr.c
@@ -329,12 +329,12 @@ Expression *copyLiteral(Expression *e)
         else if (e->op == TOKindex)
             r = new IndexExp(e->loc, ((IndexExp *)e)->e1, ((IndexExp *)e)->e2);
         else if (e->op == TOKdotvar)
-            r = new DotVarExp(e->loc, ((DotVarExp *)e)->e1,
-                ((DotVarExp *)e)->var
 #if DMDV2
-                , ((DotVarExp *)e)->hasOverloads
+            r = new DotVarExp(e->loc, ((DotVarExp *)e)->e1,
+                ((DotVarExp *)e)->var, ((DotVarExp *)e)->hasOverloads);
+#else
+            r = new DotVarExp(e->loc, ((DotVarExp *)e)->e1, ((DotVarExp *)e)->var);
 #endif
-                );
         else
             assert(0);
         r->type = e->type;
@@ -1973,11 +1973,12 @@ Expression *changeArrayLiteralLength(Loc loc, TypeArray *arrayType,
 
 bool isCtfeValueValid(Expression *newval)
 {
-    if (
 #if DMDV2
-        newval->type->ty == Tnull ||
+    bool isnull = newval->type->ty == Tnull;
+#else
+    bool isnull = false;
 #endif
-        isPointer(newval->type) )
+    if (isnull || isPointer(newval->type))
     {
         if (newval->op == TOKaddress || newval->op == TOKnull ||
             newval->op == TOKstring)

diff --git a/src/json.c b/src/json.c
@@ -970,9 +970,10 @@ void TemplateDeclaration::toJson(JsonOut *json)
             if (s->isTemplateThisParameter())
                 json->property("kind", "this");
             else
-#endif
                 json->property("kind", "type");
-
+#else
+            json->property("kind", "type");
+#endif
             json->property("type", "deco", type->specType);
 
             json->property("default", "defaultDeco", type->defaultType);

diff --git a/src/root/root.c b/src/root/root.c
@@ -1353,7 +1353,7 @@ int File::exists()
 void File::remove()
 {
 #if POSIX
-    ::remove(this->name->toChars());
+    int dummy = ::remove(this->name->toChars());
 #elif _WIN32
     DeleteFileA(this->name->toChars());
 #else