DATADIR conflicts with MinGW objidl.h header

[guest]

mingw/include/objidl.h, lines 92-95: typedef enum tagDATADIR {

DATADIR_GET=1, DATADIR_SET

} DATADIR;

libcaca/tools/Makefile.am, lines 3-4: AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca \

-I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"

gcc -DHAVE_CONFIG_H -I. -I.. -I.. -I../caca -I../caca -I../caca -DDATADIR=\"/usr/local/share/libcaca\" -fno-common -mms-bitfields -IC:/msys/local/include/pango-1.0 -IC:/msys/local/include/freetype2 -IC:/msys/local/include -IC:/msys/local/include/glib-2.0 -IC:/msys/local/lib/glib-2.0/include -g -O2 -g -O2 -fno-strength-reduce -fomit-frame-pointer -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare -MT makefont-makefont.o -MD -MP -MF .deps/makefont-makefont.Tpo -c -o makefont-makefont.o test -f 'makefont.c' || echo './'makefont.c In file included from c:\mingw\bin\../lib/gcc/mingw32/4.3.0/../../../../include/objbase.h:73,

from c:\mingw\bin\../lib/gcc/mingw32/4.3.0/../../../../include/ole2.h:9, from c:\mingw\bin\../lib/gcc/mingw32/4.3.0/../../../../include/windows.h:114, from c:\mingw\bin\../lib/gcc/mingw32/4.3.0/../../../../include/winsock2.h:22, from makefont.c:29:

c:\mingw\bin\../lib/gcc/mingw32/4.3.0/../../../../include/objidl.h:95: error: expected identifier or '(' before string constant make[2]: * [makefont-makefont.o] Error 1

How to fix: Change DATADIR to something else, like CACADATADIR or remove it completely (used only in demo.c and it's #if 0 anyway).

[Sam Hocevar]

Thanks. This was closed in commit [3404].