diff options
author | Hib Eris <hib@hiberis.nl> | 2010-07-26 09:58:51 (GMT) |
---|---|---|
committer | Hib Eris <hib@hiberis.nl> | 2010-07-26 13:34:18 (GMT) |
commit | c32bea667da3de3379f86787d8f298caeea3a789 (patch) | |
tree | 67c53e9e55f316db4a2b43d42407afb32bf7a871 /previewer | |
parent | d28b2a4d0bfa944532cec1512a2fa73ef24ebd6d (diff) |
[build] Rename DATADIR with EVINCEDATADIR
Defining DATADIR conflicts with win32 api (ObjIdl.h), so this define is
renamed to EVINCEDATADIR.
Diffstat (limited to 'previewer')
-rw-r--r-- | previewer/Makefile.am | 2 | ||||
-rw-r--r-- | previewer/ev-previewer-window.c | 2 | ||||
-rw-r--r-- | previewer/ev-previewer.c | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/previewer/Makefile.am b/previewer/Makefile.am index da0706c..ab8f95d 100644 --- a/previewer/Makefile.am +++ b/previewer/Makefile.am @@ -7,7 +7,7 @@ evince_previewer_SOURCES = \ ev-previewer-window.c evince_previewer_CPPFLAGS = \ - -DDATADIR=\"$(pkgdatadir)\" \ + -DEVINCEDATADIR=\"$(pkgdatadir)\" \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/libdocument \ diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c index 67c1708..734941e 100644 --- a/previewer/ev-previewer-window.c +++ b/previewer/ev-previewer-window.c @@ -487,7 +487,7 @@ data_dir (void) datadir = g_build_filename (dir, "share", "evince", NULL); g_free (dir); #else - datadir = g_strdup (DATADIR); + datadir = g_strdup (EVINCEDATADIR); #endif return datadir; diff --git a/previewer/ev-previewer.c b/previewer/ev-previewer.c index 2b8dea3..5029079 100644 --- a/previewer/ev-previewer.c +++ b/previewer/ev-previewer.c @@ -28,9 +28,6 @@ #include "ev-previewer-window.h" #ifdef G_OS_WIN32 -#ifdef DATADIR -#undef DATADIR -#endif #include <io.h> #include <conio.h> #if !(_WIN32_WINNT >= 0x0500) |