Source code reorganization:

[disorder] / lib / charset.h

diff --git a/lib/charset.h b/lib/charset.h
index 70b5b2f40d68baa141e1f73497a87ddc6c5f92d6..db5e7375ae6c9d238a7a54380e6b15bde14f3f11 100644 (file)
--- a/lib/charset.h
+++ b/lib/charset.h
@@ -1,6 +1,7 @@
+
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,14 +21,12 @@
 #ifndef CHARSET_H
 #define CHARSET_H
 
+#include "log.h"
+
 struct dynstr;
 
 /* Character encoding conversion routines */
 
-int one_ucs42utf8(uint32_t c, struct dynstr *d);
-
-uint32_t *utf82ucs4(const char *mb);
-char *ucs42utf8(const uint32_t *u);
 char *mb2utf8(const char *mb);
 char *utf82mb(const char *utf8);
 /* various conversions, between multibyte strings (mb) in
@@ -63,9 +62,6 @@ static inline char *nullcheck(char *s) {
   return s;
 }
 
-int ucs4cmp(const uint32_t *a, const uint32_t *b);
-/* like strcmp */
-
 const char *truncate_for_display(const char *s, long max);
 
 #endif /* CHARSET_H */