|
From: Casian A. <ske...@gm...> - 2014-11-10 10:07:29
|
>From 72c0b4522f2bfcdbef1a587ccca1cdb3e46036d5 Mon Sep 17 00:00:00 2001
From: Casian Andrei <ske...@gm...>
Date: Mon, 10 Nov 2014 11:34:59 +0200
Subject: [PATCH] Fix a warning about invalid suffix on literal concerning
C++11
The warning was:
oyranos_version.h:27: warning: invalid suffix on literal; C++11
requires a space between literal and string macro [-Wliteral-suffix]
#define OY_CMMDIR OY_LIBDIR"/"OY_CMMSUBPATH /**< install variable
*/
^
---
src/include/oyranos_version.h.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/include/oyranos_version.h.in b/src/include/
oyranos_version.h.in
index ed1dd73..164bc76 100644
--- a/src/include/oyranos_version.h.in
+++ b/src/include/oyranos_version.h.in
@@ -24,14 +24,14 @@
#define OY_LIBDIR "@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@" /**<
install variable */
#define OY_CMMSUBPATH "@OY_CMMSUBPATH@" /**< install variable */
#define OY_METASUBPATH "@OY_METASUBPATH@" /**< install variable */
-#define OY_CMMDIR OY_LIBDIR"/"OY_CMMSUBPATH /**< install
variable */
-#define OY_SYSCOLORDIR OY_DATADIR"/color" /**< install variable */
+#define OY_CMMDIR OY_LIBDIR "/" OY_CMMSUBPATH /**< install
variable */
+#define OY_SYSCOLORDIR OY_DATADIR "/color" /**< install variable */
#define OY_USERCOLORDIR "~/.config/color" /**< install variable */
#define OY_USERCOLORDATA "~/.local/share/color" /**< install variable
*/
#define OY_ICCDIRNAME "icc" /**< install variable */
#define OY_SETTINGSDIRNAME "settings" /**< install variable */
#define OY_TARGETDIRNAME "target" /**< install variable */
-#define OY_LOCALEDIR OY_DATADIR"/locale" /**< install variable */
+#define OY_LOCALEDIR OY_DATADIR "/locale" /**< install variable */
#endif /*OYRANOS_VERSION_H*/
--
2.1.0
|