From 654f86c6e05414423af719716ad028f7af7a65f5 Mon Sep 17 00:00:00 2001
From: Frank Lahm <franklahm@googlemail.com>
Date: Fri, 8 Jun 2012 11:23:28 +0200
Subject: [PATCH] Move byteorder.h to include/atalk

---
 bin/uniconv/iso8859_1_adapted.c                 | 3 +--
 include/atalk/Makefile.am                       | 4 ++--
 {libatalk/unicode => include/atalk}/byteorder.h | 0
 libatalk/unicode/Makefile.am                    | 2 +-
 libatalk/unicode/charcnv.c                      | 3 +--
 libatalk/unicode/charsets/generic_cjk.h         | 2 +-
 libatalk/unicode/charsets/generic_mb.c          | 3 ++-
 libatalk/unicode/charsets/mac_hebrew.c          | 2 +-
 libatalk/unicode/iconv.c                        | 2 +-
 libatalk/unicode/utf8.c                         | 2 +-
 libatalk/unicode/util_unistr.c                  | 3 ++-
 11 files changed, 13 insertions(+), 13 deletions(-)
 rename {libatalk/unicode => include/atalk}/byteorder.h (100%)

diff --git a/bin/uniconv/iso8859_1_adapted.c b/bin/uniconv/iso8859_1_adapted.c
index 7cdd43c3..96cfcf58 100644
--- a/bin/uniconv/iso8859_1_adapted.c
+++ b/bin/uniconv/iso8859_1_adapted.c
@@ -27,8 +27,7 @@
 
 #include <atalk/unicode.h>
 #include <atalk/logger.h>
-
-#include "../../libatalk/unicode/byteorder.h"
+#include <atalk/byteorder.h>
 
 static size_t   iso8859_adapted_pull(void *,char **, size_t *, char **, size_t *);
 static size_t   iso8859_adapted_push(void *,char **, size_t *, char **, size_t *);
diff --git a/include/atalk/Makefile.am b/include/atalk/Makefile.am
index 8ad9c7fb..77a22af6 100644
--- a/include/atalk/Makefile.am
+++ b/include/atalk/Makefile.am
@@ -41,5 +41,5 @@ noinst_HEADERS = \
 	dsi.h \
 	ldapconfig.h \
 	talloc.h \
-	dalloc.h
-
+	dalloc.h \
+	byteorder.h
diff --git a/libatalk/unicode/byteorder.h b/include/atalk/byteorder.h
similarity index 100%
rename from libatalk/unicode/byteorder.h
rename to include/atalk/byteorder.h
diff --git a/libatalk/unicode/Makefile.am b/libatalk/unicode/Makefile.am
index b56f9f35..abf6f326 100644
--- a/libatalk/unicode/Makefile.am
+++ b/libatalk/unicode/Makefile.am
@@ -17,6 +17,6 @@ libunicode_la_SOURCES = \
 
 libunicode_la_LIBADD = $(LIBUNICODE_DEPS)
 
-noinst_HEADERS = utf16_casetable.h precompose.h byteorder.h
+noinst_HEADERS = utf16_casetable.h precompose.h
 
 LIBS=@ICONV_LIBS@
diff --git a/libatalk/unicode/charcnv.c b/libatalk/unicode/charcnv.c
index 785e4772..be9186e6 100644
--- a/libatalk/unicode/charcnv.c
+++ b/libatalk/unicode/charcnv.c
@@ -42,8 +42,7 @@
 #include <atalk/unicode.h>
 #include <atalk/util.h>
 #include <atalk/compat.h>
-
-#include "byteorder.h"
+#include <atalk/byteorder.h>
 
 
 /**
diff --git a/libatalk/unicode/charsets/generic_cjk.h b/libatalk/unicode/charsets/generic_cjk.h
index 5dab15a6..3c4a48c7 100644
--- a/libatalk/unicode/charsets/generic_cjk.h
+++ b/libatalk/unicode/charsets/generic_cjk.h
@@ -19,7 +19,7 @@
 
 #include <atalk/unicode.h>
 #include <iconv.h>
-#include "../byteorder.h"
+#include <atalk/byteorder.h>
 
 #define CJK_PUSH_BUFFER 4
 #define CJK_PULL_BUFFER 8
diff --git a/libatalk/unicode/charsets/generic_mb.c b/libatalk/unicode/charsets/generic_mb.c
index 7b36997d..0347c3e7 100644
--- a/libatalk/unicode/charsets/generic_mb.c
+++ b/libatalk/unicode/charsets/generic_mb.c
@@ -35,9 +35,10 @@
 
 #include <atalk/unicode.h>
 #include <atalk/logger.h>
+#include <atalk/byteorder.h>
 
 #include "generic_mb.h"
-#include "../byteorder.h"
+
 
 
 /* ------------------------ */
diff --git a/libatalk/unicode/charsets/mac_hebrew.c b/libatalk/unicode/charsets/mac_hebrew.c
index 91a022bd..34d96902 100644
--- a/libatalk/unicode/charsets/mac_hebrew.c
+++ b/libatalk/unicode/charsets/mac_hebrew.c
@@ -34,8 +34,8 @@
 
 #include <atalk/unicode.h>
 #include <atalk/logger.h>
+#include <atalk/byteorder.h>
 
-#include "../byteorder.h"
 #include "mac_hebrew.h"
 
 static size_t   mac_hebrew_pull(void *,char **, size_t *, char **, size_t *);
diff --git a/libatalk/unicode/iconv.c b/libatalk/unicode/iconv.c
index 7c5eb67e..c44df315 100644
--- a/libatalk/unicode/iconv.c
+++ b/libatalk/unicode/iconv.c
@@ -43,7 +43,7 @@
 
 #include <atalk/unicode.h>
 #include <atalk/logger.h>
-#include "byteorder.h"
+#include <atalk/byteorder.h>
 
 
 /**
diff --git a/libatalk/unicode/utf8.c b/libatalk/unicode/utf8.c
index 896a2611..4a300398 100644
--- a/libatalk/unicode/utf8.c
+++ b/libatalk/unicode/utf8.c
@@ -34,7 +34,7 @@
 #include <atalk/unicode.h>
 #include <atalk/logger.h>
 #include <atalk/unicode.h>
-#include "byteorder.h"
+#include <atalk/byteorder.h>
 
 /* Given a trailing UTF-8 byte, get the contribution from it to
  * the Unicode scalar value for a particular bit shift amount
diff --git a/libatalk/unicode/util_unistr.c b/libatalk/unicode/util_unistr.c
index ce3355df..c163d6f6 100644
--- a/libatalk/unicode/util_unistr.c
+++ b/libatalk/unicode/util_unistr.c
@@ -22,8 +22,9 @@
 #include <arpa/inet.h>
 
 #include <atalk/unicode.h>
+#include <atalk/byteorder.h>
+
 #include "precompose.h"
-#include "byteorder.h"
 
 /*******************************************************************
  Convert a string to lower case.
-- 
2.39.2