Remove file cutil.h

It only contained three type definitions which fit better in other
include files.

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

src/classify/cluster.cpp

@@ -20,7 +20,6 @@
 #include <vector>       // for std::vector
 
 #include "cluster.h"
-#include "cutil.h"      // for void_proc
 #include "emalloc.h"
 #include "genericheap.h"
 #include "helpers.h"

src/classify/kdtree.cpp

@@ -19,7 +19,6 @@
           Include Files and Type Defines
 -----------------------------------------------------------------------------*/
 #include "kdtree.h"
-#include "cutil.h"      // for void_proc
 #include "emalloc.h"
 
 #include <algorithm>

src/classify/kdtree.h

@@ -20,10 +20,11 @@
 /*-----------------------------------------------------------------------------
           Include Files and Type Defines
 -----------------------------------------------------------------------------*/
-#include "cutil.h"      // for void_proc
 #include "host.h"
 #include "ocrfeatures.h"
 
+typedef void (*void_proc)(...);
+
 /**
 NOTE:  All circular parameters of all keys must be in the range
 

src/cutil/Makefile.am

@@ -8,7 +8,7 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
 endif
 
 noinst_HEADERS = \
-    bitvec.h callcpp.h cutil.h cutil_class.h \
+    bitvec.h callcpp.h cutil_class.h \
     emalloc.h \
     oldlist.h structures.h
 

src/cutil/cutil.h

@@ -1,30 +0,0 @@
-/* -*-C-*-
- ******************************************************************************
- *
- * File:         cutil.h
- * Description:  General utility functions
- * Author:       Mark Seaman, SW Productivity
- *
- * (c) Copyright 1987, Hewlett-Packard Company.
- ** Licensed under the Apache License, Version 2.0 (the "License");
- ** you may not use this file except in compliance with the License.
- ** You may obtain a copy of the License at
- ** http://www.apache.org/licenses/LICENSE-2.0
- ** Unless required by applicable law or agreed to in writing, software
- ** distributed under the License is distributed on an "AS IS" BASIS,
- ** 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 CUTILH
-#define CUTILH
-
-typedef void (*void_proc)(...);
-
-typedef int (*int_compare)(void*, void*);
-typedef void (*void_dest)(void*);
-
-#endif

src/cutil/oldlist.h

@@ -63,14 +63,15 @@
 #ifndef LIST_H
 #define LIST_H
 
-#include "cutil.h"              // for int_compare, void_dest, ...
-
 /*----------------------------------------------------------------------
                   T y p e s
 ----------------------------------------------------------------------*/
 
 #define NIL_LIST  ((LIST)nullptr)
 
+typedef int (*int_compare)(void*, void*);
+typedef void (*void_dest)(void*);
+
 struct list_rec
 {
   struct list_rec *node;