Fix #define guards in header files

Some guards were missing, others were not the first statement.

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Author: stweil

ccmain/paramsd.h

@@ -19,9 +19,10 @@
 //
 // Tesseract parameter editor is used to edit all the parameters used
 // within tesseract from the ui.
+#ifndef TESSERACT_CCMAIN_PARAMSD_H_
+#define TESSERACT_CCMAIN_PARAMSD_H_
+
 #ifndef GRAPHICS_DISABLED
-#ifndef VARABLED_H
-#define VARABLED_H
 
 #include "elst.h"
 #ifndef NO_CUBE_BUILD
@@ -122,5 +123,5 @@ class ParamsEditor : public SVEventHandler {
   ScrollView* sv_window_;
 };
 
-#endif
-#endif
+#endif // GRAPHICS_DISABLED
+#endif // TESSERACT_CCMAIN_PARAMSD_H_

ccutil/genericheap.h

@@ -19,12 +19,12 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#include "errcode.h"
-#include "genericvector.h"
-
 #ifndef TESSERACT_CCUTIL_GENERICHEAP_H_
 #define TESSERACT_CCUTIL_GENERICHEAP_H_
 
+#include "errcode.h"
+#include "genericvector.h"
+
 namespace tesseract {
 
 // GenericHeap requires 1 template argument:

ccutil/lsterr.h

@@ -17,10 +17,10 @@
  *
  **********************************************************************/
 
-#include          "errcode.h"    //must be last include
+#ifndef TESSERACT_CCUTIL_LSTERR_H_
+#define TESSERACT_CCUTIL_LSTERR_H_
 
-#ifndef LSTERR_H
-#define LSTERR_H
+#include          "errcode.h"    //must be last include
 
 const ERRCODE DONT_CONSTRUCT_LIST_BY_COPY =
 "Can't create a list by assignment";
@@ -39,5 +39,6 @@ const ERRCODE EMPTY_LIST = "List is empty";
 const ERRCODE BAD_PARAMETER = "List parameter error";
 const ERRCODE STILL_LINKED =
     "Attempting to add an element with non NULL links, to a list";
-#endif
-#endif
+
+#endif // !NDEBUG
+#endif // TESSERACT_CCUTIL_LSTERR_H_

ccutil/universalambigs.h

@@ -18,9 +18,14 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
+#ifndef TESSERACT_CCUTIL_UNIVERSALAMBIGS_H_
+#define TESSERACT_CCUTIL_UNIVERSALAMBIGS_H_
+
 namespace tesseract {
 
 extern const char kUniversalAmbigsFile[];
 extern const int ksizeofUniversalAmbigsFile;
 
 }  // namespace tesseract
+
+#endif // TESSERACT_CCUTIL_UNIVERSALAMBIGS_H_

classify/clusttool.h

@@ -15,8 +15,9 @@
  ** See the License for the specific language governing permissions and
  ** limitations under the License.
  ******************************************************************************/
-#ifndef   __CLUSTERTOOL__
-#define   __CLUSTERTOOL__
+
+#ifndef TESSERACT_CLASSIFY_CLUSTTOOL_H_
+#define TESSERACT_CLASSIFY_CLUSTTOOL_H_
 
 //--------------------------Include Files---------------------------------------
 #include "host.h"
@@ -61,4 +62,4 @@ void WriteProtoList(FILE *File, uinT16 N, PARAM_DESC ParamDesc[],
 #define ILLEGALDISTRIBUTION 5008
 #define ILLEGALFLOAT  5009
 #define ILLEGALESSENTIALSPEC  5013
-#endif
+#endif // TESSERACT_CLASSIFY_CLUSTTOOL_H_

opencl/opencl_device_selection.h

@@ -7,10 +7,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifdef USE_OPENCL
+
 #ifndef DEVICE_SELECTION_H
 #define DEVICE_SELECTION_H
 
+#ifdef USE_OPENCL
 
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_WARNINGS
@@ -580,5 +581,5 @@ static ds_status readProfileFromFile(ds_profile* profile,
   return status;
 }
 
-#endif
-#endif
+#endif // USE_OPENCL
+#endif // DEVICE_SELECTION_H

opencl/openclwrapper.h

@@ -7,6 +7,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
+#ifndef TESSERACT_OPENCL_OPENCLWRAPPER_H_
+#define TESSERACT_OPENCL_OPENCLWRAPPER_H_
+
 #include <stdio.h>
 #include "allheaders.h"
 #include "pix.h"
@@ -323,4 +327,5 @@ class OpenclDevice
 };
 
 
-#endif
+#endif // USE_OPENCL
+#endif // TESSERACT_OPENCL_OPENCLWRAPPER_H_

training/mergenf.h

@@ -15,6 +15,10 @@
  ** See the License for the specific language governing permissions and
  ** limitations under the License.
 ******************************************************************************/
+
+#ifndef TESSERACT_TRAINING_MERGENF_H_
+#define TESSERACT_TRAINING_MERGENF_H_
+
 /**----------------------------------------------------------------------------
 					Include Files and Type Defines
 ----------------------------------------------------------------------------**/
@@ -95,3 +99,5 @@ BOOL8 PointInside (
      FRECT	*Rectangle,
      FLOAT32	X,
 	 FLOAT32	Y);
+
+#endif // TESSERACT_TRAINING_MERGENF_H_

training/tessopt.h

@@ -17,6 +17,9 @@
  *
  **********************************************************************/
 
+#ifndef TESSERACT_TRAINING_TESSOPT_H_
+#define TESSERACT_TRAINING_TESSOPT_H_
+
 #include          "host.h"
 
 extern int tessoptind;
@@ -27,3 +30,5 @@ inT32 argc,                      //arg count
 char *argv[],                    //args
 const char *arglist                    //string of arg chars
 );
+
+#endif // TESSERACT_TRAINING_TESSOPT_H_

wordrec/lm_consistency.h

@@ -18,14 +18,14 @@
 //
 ////////////////////////////////////////////////////////////////////////
 
+#ifndef TESSERACT_WORDREC_LM_CONSISTENCY_H_
+#define TESSERACT_WORDREC_LM_CONSISTENCY_H_
+
 #include "dawg.h"
 #include "dict.h"
 #include "host.h"
 #include "ratngs.h"
 
-#ifndef TESSERACT_WORDREC_CONSISTENCY_H_
-#define TESSERACT_WORDREC_CONSISTENCY_H_
-
 namespace tesseract {
 
 static const char * const XHeightConsistencyEnumName[] = {
@@ -137,7 +137,6 @@ struct LMConsistencyInfo {
   XHeightConsistencyEnum xht_decision;
 };
 
-
 }  // namespace tesseract
 
-#endif  // TESSERACT_WORDREC_CONSISTENCY_H_
+#endif  // TESSERACT_WORDREC_LM_CONSISTENCY_H_