aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/os
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/os')
-rw-r--r--xorg-server/os/log.c10
-rw-r--r--xorg-server/os/utils.c6
2 files changed, 7 insertions, 9 deletions
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index 2a721b948..7348ad4a2 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -189,15 +189,15 @@ strlen_sigsafe(const char *s)
* string.
*/
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+
const char *
LogInit(const char *fname, const char *backup)
{
char *logFileName = NULL;
if (fname && *fname) {
-#if __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-#endif
if (asprintf(&logFileName, fname, display) == -1)
FatalError("Cannot allocate space for the log file name\n");
@@ -208,9 +208,6 @@ LogInit(const char *fname, const char *backup)
char *suffix;
char *oldLog;
-#if __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-#endif
if ((asprintf(&suffix, backup, display) == -1) ||
(asprintf(&oldLog, "%s%s", logFileName, suffix) == -1))
FatalError("Cannot allocate space for the log file name\n");
@@ -254,6 +251,7 @@ LogInit(const char *fname, const char *backup)
return logFileName;
}
+#pragma GCC diagnostic pop
void
LogClose(enum ExitCode error)
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index f3197430a..2d02f92ed 100644
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -194,7 +194,7 @@ Bool noGEExtension = FALSE;
Bool CoreDump;
-Bool enableIndirectGLX = TRUE;
+Bool enableIndirectGLX = FALSE;
#ifdef PANORAMIX
Bool PanoramiXExtensionDisabledHack = FALSE;
@@ -541,8 +541,8 @@ UseMsg(void)
ErrorF("-fn string default font name\n");
ErrorF("-fp string default font path\n");
ErrorF("-help prints message with these options\n");
- ErrorF("+iglx Allow creating indirect GLX contexts (default)\n");
- ErrorF("-iglx Prohibit creating indirect GLX contexts\n");
+ ErrorF("+iglx Allow creating indirect GLX contexts\n");
+ ErrorF("-iglx Prohibit creating indirect GLX contexts (default)\n");
ErrorF("-I ignore all remaining arguments\n");
#ifdef RLIMIT_DATA
ErrorF("-ld int limit data space to N Kb\n");