From 0e49a57a5f5f23ef327a6a2c92853516e9383787 Mon Sep 17 00:00:00 2001
From: David Nadlinger <code@klickverbot.at>
Date: Sat, 15 Jun 2013 15:06:49 +0200
Subject: [PATCH] More upstream DMD alignment.

---
 dmd2/aggregate.h   | 1 +
 dmd2/ctfeexpr.c    | 1 -
 dmd2/declaration.c | 4 ++--
 dmd2/readme.txt    | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dmd2/aggregate.h b/dmd2/aggregate.h
index 82bb53e5..518cae13 100644
--- a/dmd2/aggregate.h
+++ b/dmd2/aggregate.h
@@ -278,6 +278,7 @@ struct ClassDeclaration : AggregateDeclaration
 
     BaseClasses *vtblInterfaces;        // array of base interfaces that have
                                         // their own vtbl[]
+
     TypeInfoClassDeclaration *vclassinfo;       // the ClassInfo object for this ClassDeclaration
     int com;                            // !=0 if this is a COM class (meaning
                                         // it derives from IUnknown)
diff --git a/dmd2/ctfeexpr.c b/dmd2/ctfeexpr.c
index f9ca92ea..3ca582d6 100644
--- a/dmd2/ctfeexpr.c
+++ b/dmd2/ctfeexpr.c
@@ -1955,7 +1955,6 @@ bool isCtfeValueValid(Expression *newval)
         if (((SymOffExp *)newval)->var->isDataseg())
             return true;    // pointer to static variable
     }
-
     if (newval->op == TOKint64 || newval->op == TOKfloat64 ||
         newval->op == TOKchar || newval->op == TOKcomplex80)
         return true;
diff --git a/dmd2/declaration.c b/dmd2/declaration.c
index 1f9db8a6..a8b602d3 100644
--- a/dmd2/declaration.c
+++ b/dmd2/declaration.c
@@ -1,6 +1,6 @@
 
 // Compiler implementation of the D programming language
-// Copyright (c) 1999-2012 by Digital Mars
+// Copyright (c) 1999-2013 by Digital Mars
 // All Rights Reserved
 // written by Walter Bright
 // http://www.digitalmars.com
@@ -84,7 +84,7 @@ Declaration::Declaration(Identifier *id)
     linkage = LINKdefault;
     inuse = 0;
     sem = SemanticStart;
-    mangleOverride = NULL; 
+    mangleOverride = NULL;
 }
 
 void Declaration::semantic(Scope *sc)
diff --git a/dmd2/readme.txt b/dmd2/readme.txt
index 0d72c9be..2b79949d 100644
--- a/dmd2/readme.txt
+++ b/dmd2/readme.txt
@@ -1,15 +1,15 @@
 
 		The D Programming Language
 		Compiler Front End Source
-		Copyright (c) 1999-2009, by Digital Mars
-		http://www.digitalmars.com
+		Copyright (c) 1999-2013, by Digital Mars
+		http://www.digitalmars.com/
 		All Rights Reserved
 
 
 This is the source code to the front end Digital Mars D compiler.
 It covers the lexical analysis, parsing, and semantic analysis
 of the D Programming Language defined in the documents at
-http://www.digitalmars.com/d/
+http://dlang.org/
 
 These sources are free, they are redistributable and modifiable
 under the terms of the GNU General Public License as published by