From 99680f49fbefa088dd175b5e14f61b1bed483f9b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 25 Nov 2018 01:47:00 +0000 Subject: Switch DATADIR to DATA_DIR to not conflict with #define --- src/io/resource.cpp | 4 ++-- src/io/resource.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/io/resource.cpp b/src/io/resource.cpp index 7ca9e79c3..90b175dc3 100644 --- a/src/io/resource.cpp +++ b/src/io/resource.cpp @@ -62,7 +62,7 @@ gchar *_get_path(Domain domain, Type type, char const *filename) case UIS: temp = INKSCAPE_UIDIR; break; case PIXMAPS: temp = INKSCAPE_PIXMAPSDIR; break; #ifdef INKSCAPE_DATADIR - case DATADIR: temp = INKSCAPE_DATADIR; break; + case DATA_DIR: temp = INKSCAPE_DATADIR; break; #endif default: temp = ""; } @@ -99,7 +99,7 @@ gchar *_get_path(Domain domain, Type type, char const *filename) case THEMES: name = "themes"; break; case UIS: name = "ui"; break; case PIXMAPS: name = "pixmaps"; break; - case DATADIR: name = ""; break; + case DATA_DIR: name = ""; break; default: return _get_path(SYSTEM, type, filename); } path = profile_path(name); diff --git a/src/io/resource.h b/src/io/resource.h index 1b409b6ec..c0f8cb226 100644 --- a/src/io/resource.h +++ b/src/io/resource.h @@ -45,7 +45,7 @@ enum Type { THEMES, UIS, PIXMAPS, - DATADIR + DATA_DIR }; enum Domain { -- cgit v1.2.3