[dasher] Replace HAVE_CONFIG_H removed by Chinese dasher.



commit 93034afaf1be1d2ca0609601e83167ed62c641b3
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Thu Jul 2 15:04:32 2009 +0100

    Replace HAVE_CONFIG_H removed by Chinese dasher.

 ChangeLog                                   |    1 +
 Src/DasherCore/AlphabetManagerFactory.cpp   |    2 +-
 Src/DasherCore/ConversionManagerFactory.cpp |    4 ++--
 Src/DasherCore/PinYinConversionHelper.cpp   |    5 ++---
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f0f7ef1..afef96b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* White space to keep gcc happy, and typos.
 	* OneStepTowards now returns true.
+	* Replace HAVE_CONFIG_H removed by Chinese dasher.
 
 2009-07-02  Alan Lawrence <acl33 inf phy cam ac uk>
 
diff --git a/Src/DasherCore/AlphabetManagerFactory.cpp b/Src/DasherCore/AlphabetManagerFactory.cpp
index d2ce170..f96c257 100644
--- a/Src/DasherCore/AlphabetManagerFactory.cpp
+++ b/Src/DasherCore/AlphabetManagerFactory.cpp
@@ -58,7 +58,7 @@ CAlphabetManagerFactory::CAlphabetManagerFactory(CDasherInterfaceBase *pInterfac
   m_iConversionID = oAlphInfo.m_iConversionID;
 
   //WZ: Mandarin Dasher Change
-  //If statemenet checks for the specific Super PinYin alphabet, and sets language model to PPMPY
+  //If statement checks for the specific Super PinYin alphabet, and sets language model to PPMPY
   if((m_iConversionID==2)&&(pSettingsStore->GetStringParameter(SP_ALPHABET_ID)=="Chinese Super Pin Yin, grouped by Dictionary")){
 
     std::string CHAlphabet = "Chinese / ç®?ä½?中æ?? (simplified chinese, in pin yin groups)";
diff --git a/Src/DasherCore/ConversionManagerFactory.cpp b/Src/DasherCore/ConversionManagerFactory.cpp
index 718667c..e704af0 100644
--- a/Src/DasherCore/ConversionManagerFactory.cpp
+++ b/Src/DasherCore/ConversionManagerFactory.cpp
@@ -1,5 +1,5 @@
-#ifndef WIN32
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif
 
 #include "ConversionManager.h"
diff --git a/Src/DasherCore/PinYinConversionHelper.cpp b/Src/DasherCore/PinYinConversionHelper.cpp
index 66d4370..379f2a4 100644
--- a/Src/DasherCore/PinYinConversionHelper.cpp
+++ b/Src/DasherCore/PinYinConversionHelper.cpp
@@ -1,6 +1,5 @@
-
-#ifndef _WIN32
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif 
 
 #include "LanguageModelling/LanguageModel.h"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]