From 21a926c93622d618811e3e81950da1e7624df646 Mon Sep 17 00:00:00 2001
From: Alexey Prokhin <alexey.prokhin@yandex.ru>
Date: Sat, 21 Apr 2012 17:59:34 +0400
Subject: [PATCH] Resolved small merge conflict.

FuncAliasDeclaration::mangle() was wrongly put into '#if IN_DMD' block.
---
 dmd2/declaration.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dmd2/declaration.h b/dmd2/declaration.h
index b9429f6a..6db1c5fc 100644
--- a/dmd2/declaration.h
+++ b/dmd2/declaration.h
@@ -928,8 +928,8 @@ struct FuncAliasDeclaration : FuncDeclaration
     const char *kind();
 #if IN_DMD
     Symbol *toSymbol();
-    char *mangle() { return toAliasFunc()->mangle(); }
 #endif
+    char *mangle() { return toAliasFunc()->mangle(); }
 
     FuncDeclaration *toAliasFunc();
 };