Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/thumbnailer
diff options
context:
space:
mode:
authorHib Eris <hib@hiberis.nl>2010-07-26 09:58:51 (GMT)
committer Hib Eris <hib@hiberis.nl>2010-07-26 13:34:18 (GMT)
commitc32bea667da3de3379f86787d8f298caeea3a789 (patch)
tree67c53e9e55f316db4a2b43d42407afb32bf7a871 /thumbnailer
parentd28b2a4d0bfa944532cec1512a2fa73ef24ebd6d (diff)
[build] Rename DATADIR with EVINCEDATADIR
Defining DATADIR conflicts with win32 api (ObjIdl.h), so this define is renamed to EVINCEDATADIR.
Diffstat (limited to 'thumbnailer')
-rw-r--r--thumbnailer/Makefile.am2
-rw-r--r--thumbnailer/evince-thumbnailer.c5
2 files changed, 2 insertions, 5 deletions
diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index 45e3d2a..171c00f 100644
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -5,7 +5,7 @@ evince_thumbnailer_SOURCES = \
evince-thumbnailer.c
evince_thumbnailer_CPPFLAGS = \
- -DDATADIR=\"$(pkgdatadir)\" \
+ -DEVINCEDATADIR=\"$(pkgdatadir)\" \
-I$(top_srcdir) \
-I$(top_builddir) \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
diff --git a/thumbnailer/evince-thumbnailer.c b/thumbnailer/evince-thumbnailer.c
index 69c8a8d..31da3d3 100644
--- a/thumbnailer/evince-thumbnailer.c
+++ b/thumbnailer/evince-thumbnailer.c
@@ -26,9 +26,6 @@
#include <string.h>
#ifdef G_OS_WIN32
-#ifdef DATADIR
-#undef DATADIR
-#endif
#include <io.h>
#include <conio.h>
#if !(_WIN32_WINNT >= 0x0500)
@@ -156,7 +153,7 @@ evince_thumbnail_pngenc_get (EvDocument *document, const char *thumbnail, int si
gchar *overlaid_icon_path = g_build_filename (dir, "share", "evince", overlaid_icon_name, NULL);
g_free (dir);
#else
- gchar *overlaid_icon_path = g_strdup_printf ("%s/%s", DATADIR, overlaid_icon_name);
+ gchar *overlaid_icon_path = g_strdup_printf ("%s/%s", EVINCEDATADIR, overlaid_icon_name);
#endif
overlaid_pixbuf = gdk_pixbuf_new_from_file (overlaid_icon_path, NULL);
g_free (overlaid_icon_path);