Move shl_misc.h into libtsm_int.h

Add a single internal header for all our shared but private code. Remove
now unused shl_misc.h.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index f1e872b..e6dfdb7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,8 +98,7 @@ libshl_la_SOURCES = \
        src/shl_hashtable.h \
        external/htable.h \
        external/htable.c \
-       src/shl_llog.h \
-       src/shl_misc.h
+       src/shl_llog.h
 libshl_la_CPPFLAGS = $(AM_CPPFLAGS)
 libshl_la_LDFLAGS = $(AM_LDFLAGS)
 libshl_la_LIBADD = $(AM_LIBADD)
@@ -119,6 +118,7 @@ pkgconfig_DATA += docs/libtsm.pc
 
 libtsm_la_SOURCES = \
        src/libtsm.h \
+       src/libtsm_int.h \
        src/tsm_unicode.h \
        src/tsm_unicode.c \
        src/tsm_screen.h \

diff --git a/src/shl_misc.h b/src/libtsm_int.h
similarity index 87%
rename from src/shl_misc.h
rename to src/libtsm_int.h
index ac810d5..77fc0be 100644 (file)
--- a/src/shl_misc.h
+++ b/src/libtsm_int.h
@@ -1,5 +1,5 @@
 /*
- * shl - Miscellaneous small helpers
+ * TSM - Main internal header
  *
  * Copyright (c) 2011-2013 David Herrmann <dh.herrmann@gmail.com>
  *
@@ -23,17 +23,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/*
- * Miscellaneous helpers
- */
-
-#ifndef SHL_MISC_H
-#define SHL_MISC_H
+#ifndef TSM_LIBTSM_INT_H
+#define TSM_LIBTSM_INT_H
 
-#include <errno.h>
-#include <limits.h>
 #include <stdlib.h>
 
 #define SHL_EXPORT __attribute__((visibility("default")))
 
-#endif /* SHL_MISC_H */
+#endif /* TSM_LIBTSM_INT_H */

diff --git a/src/tsm_screen.c b/src/tsm_screen.c
index deb2010..8a299d2 100644 (file)
--- a/src/tsm_screen.c
+++ b/src/tsm_screen.c
@@ -62,8 +62,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "libtsm.h"
+#include "libtsm_int.h"
 #include "shl_llog.h"
-#include "shl_misc.h"
 
 #define LLOG_SUBSYSTEM "tsm_screen"
 

diff --git a/src/tsm_unicode.c b/src/tsm_unicode.c
index d0aee97..c594e7f 100644 (file)
--- a/src/tsm_unicode.c
+++ b/src/tsm_unicode.c
@@ -59,9 +59,9 @@
 #include <string.h>
 #include "external/wcwidth.h"
 #include "libtsm.h"
+#include "libtsm_int.h"
 #include "shl_array.h"
 #include "shl_hashtable.h"
-#include "shl_misc.h"
 
 /*
  * Unicode Symbol Handling

diff --git a/src/tsm_vte.c b/src/tsm_vte.c
index 111678f..70d34d9 100644 (file)
--- a/src/tsm_vte.c
+++ b/src/tsm_vte.c
@@ -50,8 +50,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "libtsm.h"
+#include "libtsm_int.h"
 #include "shl_llog.h"
-#include "shl_misc.h"
 
 #ifdef BUILD_HAVE_XKBCOMMON
 #  include <xkbcommon/xkbcommon-keysyms.h>

diff --git a/src/tsm_vte_charsets.c b/src/tsm_vte_charsets.c
index f356e52..0b8758a 100644 (file)
--- a/src/tsm_vte_charsets.c
+++ b/src/tsm_vte_charsets.c
@@ -67,7 +67,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "libtsm.h"
-#include "shl_misc.h"
+#include "libtsm_int.h"
 
 /*
  * Lower Unicode character set. This maps the characters to the basic ASCII