ff-utf8.h is back... as an alias to ff-unicode.h

diff --git a/lib/Makefile b/lib/Makefile
index 432a14ec97456998a3dd6062c77e2245b47842bb..7e520c28a8de5d07341eb19fca4ca258980f0e7a 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -49,7 +49,7 @@ LIBUCW_INCLUDES= \
        bitops.h \
        conf.h getopt.h ipaccess.h \
        profile.h \
-       fastbuf.h lfs.h ff-unicode.h ff-binary.h \
+       fastbuf.h lfs.h ff-unicode.h ff-utf8.h ff-binary.h \
        chartype.h unicode.h stkstring.h \
        wildmatch.h patmatch.h \
        db.h \

diff --git a/lib/ff-unicode.h b/lib/ff-unicode.h
index 93f8a06ec013bf83dee248eb6f6699f40df081c2..af39bbda7ab50fd706072c61a432fcdc1013aaf4 100644 (file)
--- a/lib/ff-unicode.h
+++ b/lib/ff-unicode.h
@@ -1,15 +1,16 @@
 /*
- *     UCW Library: Reading and writing of UTF-8 on Fastbuf Streams
+ *     UCW Library: Reading and writing of UTF-8 and UTF-16 on Fastbuf Streams
  *
  *     (c) 2001--2004 Martin Mares <mj@ucw.cz>
  *     (c) 2004 Robert Spalek <robert@ucw.cz>
+ *     (c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
  */
 
-#ifndef _UCW_FF_UTF8_H
-#define _UCW_FF_UTF8_H
+#ifndef _UCW_FF_UNICODE_H
+#define _UCW_FF_UNICODE_H
 
 #include "lib/fastbuf.h"
 #include "lib/unicode.h"

diff --git a/lib/ff-utf8.h b/lib/ff-utf8.h
new file mode 100644 (file)
index 0000000..af7543f
--- /dev/null
+++ b/lib/ff-utf8.h
@@ -0,0 +1,15 @@
+/*
+ *     UCW Library: An alias for lib/ff-unicode.h (for backwards compatibility)
+ *
+ *     (c) 2008 Pavel Charvat <pchar@ucw.cz>
+ *
+ *     This software may be freely distributed and used according to the terms
+ *     of the GNU Lesser General Public License.
+ */
+
+#ifndef _UCW_FF_UTF8_H
+#define _UCW_FF_UTF8_H
+
+#include "lib/ff-unicode.h"
+
+#endif