[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 756373a772: Fix warnings without XCB or XFixes
From: |
Po Lu |
Subject: |
master 756373a772: Fix warnings without XCB or XFixes |
Date: |
Sun, 13 Nov 2022 02:35:24 -0500 (EST) |
branch: master
commit 756373a772c2c096bad1b26d7e46fa6144086ce1
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Fix warnings without XCB or XFixes
* src/xterm.c (x_term_init): Don't USE_SAFE_ALLOCA or call
SAFE_FREE outside of where it is actually used. For some reason
the compiler still emitted warnings despite the ((void)
SAFE_ALLOCA (0)) statement.
---
src/xterm.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/xterm.c b/src/xterm.c
index e50f669e67..48ddd17568 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -29120,10 +29120,9 @@ x_term_init (Lisp_Object display_name, char
*xrm_option, char *resource_name)
#endif
int i;
+#if defined HAVE_XFIXES && defined USE_XCB
USE_SAFE_ALLOCA;
-
- /* Avoid warnings when SAFE_ALLOCA is not actually used. */
- ((void) SAFE_ALLOCA (0));
+#endif
block_input ();
@@ -29277,7 +29276,9 @@ x_term_init (Lisp_Object display_name, char
*xrm_option, char *resource_name)
unblock_input ();
+#if defined HAVE_XFIXES && defined USE_XCB
SAFE_FREE ();
+#endif
return 0;
}
@@ -29297,7 +29298,9 @@ x_term_init (Lisp_Object display_name, char
*xrm_option, char *resource_name)
unblock_input ();
+#if defined HAVE_XFIXES && defined USE_XCB
SAFE_FREE ();
+#endif
return 0;
}
#endif
@@ -30182,7 +30185,9 @@ x_term_init (Lisp_Object display_name, char
*xrm_option, char *resource_name)
unblock_input ();
+#if defined HAVE_XFIXES && defined USE_XCB
SAFE_FREE ();
+#endif
return dpyinfo;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 756373a772: Fix warnings without XCB or XFixes,
Po Lu <=