From 5b15c782d0e682ce1e271b7009b505899ea86fc3 Mon Sep 17 00:00:00 2001 From: Matthew Brush Date: Mon, 4 Mar 2013 02:19:05 -0800 Subject: [PATCH] Remove cfutypes.h(.in) since it seems to be useless Also make cfu.h not generated. Need to fix the @VERSION@ replacement it was using in a future commit, for now it's just hardcoded. --- configure.ac | 2 -- include/cfu.h | 3 +- include/cfu.h.in | 82 ------------------------------------------- include/cfutypes.h | 13 ------- include/cfutypes.h.in | 13 ------- 5 files changed, 1 insertion(+), 112 deletions(-) delete mode 100644 include/cfu.h.in delete mode 100644 include/cfutypes.h delete mode 100644 include/cfutypes.h.in diff --git a/configure.ac b/configure.ac index ba0faf1..bfdd64b 100644 --- a/configure.ac +++ b/configure.ac @@ -53,8 +53,6 @@ AC_CONFIG_FILES([ src/Makefile examples/Makefile doc/Makefile - include/cfutypes.h - include/cfu.h ]) AC_OUTPUT diff --git a/include/cfu.h b/include/cfu.h index 96e43e2..10177d8 100644 --- a/include/cfu.h +++ b/include/cfu.h @@ -42,7 +42,6 @@ #define _LIBCFU_H_ #include -#include #ifdef __cplusplus #define CFU_BEGIN_DECLS extern "C" { @@ -62,7 +61,7 @@ CFU_BEGIN_DECLS #define _THREAD_SAFE 1 #endif -#define LIBCFU_VERSION "0.03" +#define LIBCFU_VERSION "0.04" typedef enum { libcfu_t_none = 0, libcfu_t_hash_table, libcfu_t_list, libcfu_t_string, libcfu_t_time, libcfu_t_conf } libcfu_type; diff --git a/include/cfu.h.in b/include/cfu.h.in deleted file mode 100644 index e9843db..0000000 --- a/include/cfu.h.in +++ /dev/null @@ -1,82 +0,0 @@ -/* Creation date: 2005-07-06 07:34:51 - * Authors: Don - * Change log: - */ - -/* Copyright (c) 2005 Don Owens - All rights reserved. - - This code is released under the BSD license: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - * Neither the name of the author nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef _LIBCFU_H_ -#define _LIBCFU_H_ - -#include -#include - -#ifdef __cplusplus -#define CFU_BEGIN_DECLS extern "C" { -#define CFU_END_DECLS } -#else -#define CFU_BEGIN_DECLS -#define CFU_END_DECLS -#endif - -CFU_BEGIN_DECLS - -/* define this to get thread-safe versions of functions */ -#ifndef _REENTRANT -#define _REENTRANT 1 -#endif -#ifndef _THREAD_SAFE -#define _THREAD_SAFE 1 -#endif - -#define LIBCFU_VERSION "@VERSION@" - -typedef enum { libcfu_t_none = 0, libcfu_t_hash_table, libcfu_t_list, libcfu_t_string, - libcfu_t_time, libcfu_t_conf } libcfu_type; - -struct libcfu_item; -typedef struct libcfu_item libcfu_item_t; - -extern libcfu_type cfu_get_type(void *item); -extern int cfu_is_hash(void *item); -extern int cfu_is_list(void *item); -extern int cfu_is_string(void *item); -extern int cfu_is_time(void *item); -extern int cfu_is_conf(void *item); - -CFU_END_DECLS - -#endif diff --git a/include/cfutypes.h b/include/cfutypes.h deleted file mode 100644 index 299a17f..0000000 --- a/include/cfutypes.h +++ /dev/null @@ -1,13 +0,0 @@ -/* Creation date: 2005-07-30 16:44:11 - * Authors: Don - * Change log: - */ - -#ifndef _CFU_TYPES_H_ -#define _CFU_TYPES_H_ - -#include - -/* u_int is defined */ - -#endif diff --git a/include/cfutypes.h.in b/include/cfutypes.h.in deleted file mode 100644 index 1d4bd9c..0000000 --- a/include/cfutypes.h.in +++ /dev/null @@ -1,13 +0,0 @@ -/* Creation date: 2005-07-30 16:44:11 - * Authors: Don - * Change log: - */ - -#ifndef _CFU_TYPES_H_ -#define _CFU_TYPES_H_ - -#include - -@LIBCFU_TYPE_u_int@ - -#endif