[gtk+] x11: Use macros for byte order to set byte order
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] x11: Use macros for byte order to set byte order
- Date: Tue, 1 Feb 2011 05:33:40 +0000 (UTC)
commit 180cd853fc8d32a26fa8d9cddd9dfa2e8e9198fe
Author: Benjamin Otte <otte redhat com>
Date: Tue Feb 1 06:04:01 2011 +0100
x11: Use macros for byte order to set byte order
No need to run sophisticated functions to guess it.
gdk/x11/gdkdnd-x11.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index eab817f..2784060 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -846,7 +846,11 @@ enum {
/* Byte swapping routines. The motif specification leaves it
* up to us to save a few bytes in the client messages
*/
-static gchar local_byte_order = '\0';
+#if G_BYTE_ORDER == G_BIG_ENDIAN
+static gchar local_byte_order = 'B';
+#else
+static gchar local_byte_order = 'l';
+#endif
#ifdef G_ENABLE_DEBUG
static void
@@ -862,13 +866,6 @@ print_target_list (GList *targets)
}
#endif /* G_ENABLE_DEBUG */
-static void
-init_byte_order (void)
-{
- guint32 myint = 0x01020304;
- local_byte_order = (*(gchar *)&myint == 1) ? 'B' : 'l';
-}
-
static guint16
card16_to_host (guint16 x, gchar byte_order)
{
@@ -3132,7 +3129,6 @@ void
_gdk_x11_display_init_dnd (GdkDisplay *display)
{
int i;
- init_byte_order ();
for (i = 0; i < G_N_ELEMENTS (xdnd_filters); i++)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]