diff options
author | Marcel Krems <m.krems@software-vision.eu> | 2013-10-09 04:24:06 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-16 21:29:17 +0200 |
commit | 24b817f20a7956470971b64436f6b8f1f9745115 (patch) | |
tree | dc8d866da163473efbbcb83fab748eefe8293846 | |
parent | 77adddae373cb9e5019a1d789014925330fb8d75 (diff) |
Fix compilation with Clang and libc++ under Linux
src/plugins/platforms/xcb/qxcbsessionmanager.cpp:205:80: error: use of undeclared identifier 'ERANGE'
while (getpwuid_r(geteuid(), &entry, buf.data(), buf.size(), &entryPtr) == ERANGE) {
src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp:173:28: error: use of undeclared identifier 'LC_CTYPE'
char *name = setlocale(LC_CTYPE, (char *)0);
Change-Id: Ide6f3072e9158eef412973ce0a72babb41b695f0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp | 1 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qxcbsessionmanager.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp index c222b62a36..b5e3aa741e 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -55,6 +55,7 @@ #include <xkbcommon_workaround.h> #endif +#include <locale.h> // LC_CTYPE #include <string.h> // strchr, strncmp, etc. #include <strings.h> // strncasecmp diff --git a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp index 6abe24b7ab..9d81c8e224 100644 --- a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp +++ b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp @@ -48,6 +48,7 @@ #include <qplatformdefs.h> #include <qsocketnotifier.h> #include <X11/SM/SMlib.h> +#include <errno.h> // ERANGE class QSmSocketReceiver : public QObject |