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
This commit is contained in:
Jeff Morriss 2008-07-11 16:18:32 +00:00
parent 77c287a58c
commit 2cd9755e81
4 changed files with 11 additions and 10 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 */