diff options
| author | Ted Gould <ted@gould.cx> | 2018-11-25 01:47:00 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2018-11-25 01:54:22 +0000 |
| commit | 99680f49fbefa088dd175b5e14f61b1bed483f9b (patch) | |
| tree | fdbc853758fc108aac1a3cd61600924e5804e488 /src | |
| parent | EekPreview: rm unused function header (diff) | |
| download | inkscape-99680f49fbefa088dd175b5e14f61b1bed483f9b.tar.gz inkscape-99680f49fbefa088dd175b5e14f61b1bed483f9b.zip | |
Switch DATADIR to DATA_DIR to not conflict with #define
Diffstat (limited to 'src')
| -rw-r--r-- | src/io/resource.cpp | 4 | ||||
| -rw-r--r-- | src/io/resource.h | 2 |
2 files changed, 3 insertions, 3 deletions
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 { |