From 0acb58f9ea7ba6e4c623b4917d0fd3401b37a7f6 Mon Sep 17 00:00:00 2001
From: Robert Kessl <kesslr@centrum.cz>
Date: Tue, 29 Jul 2014 10:45:56 +0200
Subject: [PATCH] tableprinter&xtypes: table-types.[ch] moved to
 xtypes-extra.[ch]

---
 ucw/Makefile                          | 4 ++--
 ucw/table-test-2.c                    | 2 +-
 ucw/table-test.c                      | 2 +-
 ucw/{table-types.c => xtypes-extra.c} | 3 ++-
 ucw/{table-types.h => xtypes-extra.h} | 7 ++++---
 ucw/xtypes-test.c                     | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)
 rename ucw/{table-types.c => xtypes-extra.c} (99%)
 rename ucw/{table-types.h => xtypes-extra.h} (91%)

diff --git a/ucw/Makefile b/ucw/Makefile
index 5b62dba0..c886cb69 100644
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -38,7 +38,7 @@ LIBUCW_MODS= \
 	daemon daemon-ctrl \
 	signames \
 	opt opt-help opt-conf \
-	table table-types xtypes xtypes-basic
+	table xtypes xtypes-basic xtypes-extra
 
 LIBUCW_MAIN_INCLUDES= \
 	lib.h log.h tbf.h threads.h time.h \
@@ -69,7 +69,7 @@ LIBUCW_MAIN_INCLUDES= \
 	signames.h \
 	sighandler.h \
 	opt.h \
-	table.h table-types.h \
+	table.h xtypes-extra.h \
 	xtypes.h
 
 ifdef CONFIG_UCW_THREADS
diff --git a/ucw/table-test-2.c b/ucw/table-test-2.c
index 2625d219..78df449b 100644
--- a/ucw/table-test-2.c
+++ b/ucw/table-test-2.c
@@ -6,7 +6,7 @@
 
 #include <ucw/lib.h>
 #include <ucw/table.h>
-#include <ucw/table-types.h>
+#include <ucw/xtypes-extra.h>
 #include <ucw/opt.h>
 #include <stdio.h>
 
diff --git a/ucw/table-test.c b/ucw/table-test.c
index 64acedb8..06bf7057 100644
--- a/ucw/table-test.c
+++ b/ucw/table-test.c
@@ -6,7 +6,7 @@
 
 #include <ucw/lib.h>
 #include <ucw/table.h>
-#include <ucw/table-types.h>
+#include <ucw/xtypes-extra.h>
 #include <ucw/opt.h>
 #include <stdio.h>
 
diff --git a/ucw/table-types.c b/ucw/xtypes-extra.c
similarity index 99%
rename from ucw/table-types.c
rename to ucw/xtypes-extra.c
index 4da3ccc8..589ac2cb 100644
--- a/ucw/table-types.c
+++ b/ucw/xtypes-extra.c
@@ -5,7 +5,6 @@
  */
 
 #include <ucw/lib.h>
-#include <ucw/table-types.h>
 #include <ucw/fastbuf.h>
 #include <ucw/strtonum.h>
 #include <ucw/table.h>
@@ -14,6 +13,8 @@
 #include <inttypes.h>
 #include <errno.h>
 
+#include <ucw/xtypes-extra.h>
+
 // FIXME: I seriously doubt there is any good reason for keeping
 // these types separated from the generic xtype machinery. There
 // is nothing special in them, which would be tightly connected
diff --git a/ucw/table-types.h b/ucw/xtypes-extra.h
similarity index 91%
rename from ucw/table-types.h
rename to ucw/xtypes-extra.h
index 0220288d..4e76b8dd 100644
--- a/ucw/table-types.h
+++ b/ucw/xtypes-extra.h
@@ -1,12 +1,13 @@
 /*
- *	UCW Library -- Table printer
+ *	UCW Library -- Extended types - extra types
  *
  *	(c) 2014 Robert Kessl <robert.kessl@economia.cz>
  */
 
-#ifndef _UCW_TABLE_TYPES_H
-#define _UCW_TABLE_TYPES_H
+#ifndef _UCW_XTYPES_EXTRA_H
+#define _UCW_XTYPES_EXTRA_H
 
+#include <ucw/xtypes.h>
 #include <ucw/table.h>
 
 #ifdef CONFIG_UCW_CLEAN_ABI
diff --git a/ucw/xtypes-test.c b/ucw/xtypes-test.c
index 95302036..517e7f2c 100644
--- a/ucw/xtypes-test.c
+++ b/ucw/xtypes-test.c
@@ -10,7 +10,7 @@
 #include <ucw/lib.h>
 #include <ucw/mempool.h>
 #include <ucw/xtypes.h>
-#include <ucw/table-types.h>
+#include <ucw/xtypes-extra.h>
 
 #include <errno.h>
 #include <stdlib.h>
-- 
2.39.2