From 11786aeb352057675863c7dab9e315b398f398f5 Mon Sep 17 00:00:00 2001
From: kai <kai@redstar.de>
Date: Sat, 4 Feb 2012 20:36:59 +0100
Subject: [PATCH] Remove last traces of _DH.

With the merge of 1.072 the definition of _DH is no longer needed.
---
 CMakeLists.txt     | 1 -
 gen/cl_options.cpp | 3 ---
 gen/cl_options.h   | 2 --
 gen/main.cpp       | 9 +--------
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66cded47..09ccc5fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,7 +240,6 @@ include_directories(
 
 add_definitions(
     -DIN_LLVM
-    -D_DH
     -DOPAQUE_VTBLS
     -DLDC_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"
 )
diff --git a/gen/cl_options.cpp b/gen/cl_options.cpp
index 1388e3d2..d3c0793f 100644
--- a/gen/cl_options.cpp
+++ b/gen/cl_options.cpp
@@ -150,7 +150,6 @@ cl::opt<std::string> jsonFile("Xf",
     cl::Prefix);
 
 // Header generation options
-#ifdef _DH
 static cl::opt<bool, true> doHdrGen("H",
     cl::desc("Generate 'header' file"),
     cl::location(global.params.doHdrGeneration));
@@ -164,8 +163,6 @@ cl::opt<std::string> hdrFile("Hf",
     cl::desc("Write 'header' file to <filename>"),
     cl::value_desc("filename"),
     cl::Prefix);
-#endif
-
 
 
 static cl::opt<bool, true> unittest("unittest",
diff --git a/gen/cl_options.h b/gen/cl_options.h
index 6d5dca42..3eb8f5c1 100644
--- a/gen/cl_options.h
+++ b/gen/cl_options.h
@@ -36,10 +36,8 @@ namespace opts {
     extern cl::opt<std::string> ddocDir;
     extern cl::opt<std::string> ddocFile;
     extern cl::opt<std::string> jsonFile;
-#ifdef _DH
     extern cl::opt<std::string> hdrDir;
     extern cl::opt<std::string> hdrFile;
-#endif
     extern cl::list<std::string> versions;
     extern cl::opt<std::string> moduleDepsFile;
 
diff --git a/gen/main.cpp b/gen/main.cpp
index 94a69d06..f2fcbee5 100644
--- a/gen/main.cpp
+++ b/gen/main.cpp
@@ -242,12 +242,10 @@ int main(int argc, char** argv)
     if (global.params.xfilename)
         global.params.doXGeneration = true;
 
-#ifdef _DH
     initFromString(global.params.hdrdir, hdrDir);
     initFromString(global.params.hdrname, hdrFile);
     global.params.doHdrGeneration |=
         global.params.hdrdir || global.params.hdrname;
-#endif
 
     initFromString(global.params.moduleDepsFile, moduleDepsFile);
     if (global.params.moduleDepsFile != NULL)
@@ -837,11 +835,7 @@ LDC_TARGETS
             Module::rootModule = m;
         m->importedFrom = m;
         m->read(0);
-#ifdef _DH
         m->parse(global.params.doDocComments);
-#else
-        m->parse();
-#endif
         m->buildTargetFiles(singleObj);
         m->deleteObjFile();
         if (m->isDocFile)
@@ -855,7 +849,7 @@ LDC_TARGETS
     }
     if (global.errors)
         fatal();
-#ifdef _DH
+
     if (global.params.doHdrGeneration)
     {
         /* Generate 'header' import files.
@@ -873,7 +867,6 @@ LDC_TARGETS
     }
     if (global.errors)
         fatal();
-#endif
 
     // load all unconditional imports for better symbol resolving
     for (unsigned i = 0; i < modules.dim; i++)