From 2cd9755e81f98a8de24239f3aedca6dde324709c Mon Sep 17 00:00:00 2001
From: Jeff Morriss <jeff.morriss@ulticom.com>
Date: Fri, 11 Jul 2008 16:18:32 +0000
Subject: unicode-utils.c is only for Windows; don't build it on UN*X.  Put in
 a check to cause it to fail when built on UN*X.

svn path=/trunk/; revision=25704
---
 wsutil/Makefile.am     | 6 ++++--
 wsutil/Makefile.common | 6 ++----
 wsutil/Makefile.nmake  | 4 ++--
 wsutil/unicode-utils.c | 5 +++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index 08944cc917..661c535515 100644
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@@ -42,7 +42,9 @@ EXTRA_DIST = \
 	Makefile.common	\
 	Makefile.nmake	\
 	file_util.c	\
-	file_util.h 
+	file_util.h 	\
+	unicode-utils.c	\
+	unicode-utils.h
 
 CLEANFILES = \
 	libwsutil.a	\
@@ -55,4 +57,4 @@ MAINTAINERCLEANFILES = \
 checkapi:
 	$(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \
 	$(LIBWSUTIL_SRC)
-#	file_util.c
+#	file_util.c unicode-utils.c
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index df0c87d6e0..284e62eee6 100644
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -30,11 +30,9 @@
 # _SOURCES variables).
 LIBWSUTIL_SRC = 	\
 	mpeg-audio.c	\
-	privileges.c	\
-	unicode-utils.c
+	privileges.c
 
 # Header files that are not generated from other files
 LIBWSUTIL_INCLUDES = 	\
 	mpeg-audio.h	\
-	privileges.h	\
-	unicode-utils.h
+	privileges.h
diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake
index 743f86ad29..22decd24f6 100644
--- a/wsutil/Makefile.nmake
+++ b/wsutil/Makefile.nmake
@@ -22,7 +22,7 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 # For use when making libwsutil.dll
 libwsutil_LIBS = $(GLIB_LIBS)
 
-OBJECTS = file_util.obj $(LIBWSUTIL_SRC:.c=.obj)
+OBJECTS = file_util.obj unicode-utils.obj $(LIBWSUTIL_SRC:.c=.obj)
 
 
 # For use when making libwsutil.dll
@@ -55,4 +55,4 @@ maintainer-clean: distclean
 checkapi:
 	$(PERL) ../tools/checkAPIs.pl -g abort -g termoutput \
 	$(LIBWSUTIL_SRC) \
-#	file_util.c
+#	file_util.c unicode-utils.c
diff --git a/wsutil/unicode-utils.c b/wsutil/unicode-utils.c
index dfa6eb32d5..91c4aeca88 100644
--- a/wsutil/unicode-utils.c
+++ b/wsutil/unicode-utils.c
@@ -22,7 +22,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifdef _WIN32
+#ifndef _WIN32
+#error "This is only for Windows"
+#endif
 
 #include <glib.h>
 #include "unicode-utils.h"
@@ -125,4 +127,3 @@ gchar * utf_16to8(const wchar_t *utf16str) {
   return utf8buf[idx];
 }
 
-#endif	/* _WIN32 */
-- 
cgit v1.2.3