check for __pentium4__ when deciding whether to use bswap for

Sun May  2 03:51:59 2004  Manish Singh  <yosh@gimp.org>

        * glib/gtypes.h: check for __pentium4__ when deciding whether to
        use bswap for GUINT32_SWAP_LE_BE_IA32(). Fixes bug #141620.

diff --git a/ChangeLog b/ChangeLog
index 3bc3c983ab1582ac928deb69dc9f33138bb60e49..877a9bb55a64e8043b73d631896108b5032d3770 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May  2 03:51:59 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/gtypes.h: check for __pentium4__ when deciding whether to
+       use bswap for GUINT32_SWAP_LE_BE_IA32(). Fixes bug #141620.
+
 2004-05-01  Hans Breuer  <hans@breuer.org>
 
        * glib/gnulib/Makefile.am : added makefile.msc to EXTRA_DIST

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3bc3c983ab1582ac928deb69dc9f33138bb60e49..877a9bb55a64e8043b73d631896108b5032d3770 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun May  2 03:51:59 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/gtypes.h: check for __pentium4__ when deciding whether to
+       use bswap for GUINT32_SWAP_LE_BE_IA32(). Fixes bug #141620.
+
 2004-05-01  Hans Breuer  <hans@breuer.org>
 
        * glib/gnulib/Makefile.am : added makefile.msc to EXTRA_DIST

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 3bc3c983ab1582ac928deb69dc9f33138bb60e49..877a9bb55a64e8043b73d631896108b5032d3770 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Sun May  2 03:51:59 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/gtypes.h: check for __pentium4__ when deciding whether to
+       use bswap for GUINT32_SWAP_LE_BE_IA32(). Fixes bug #141620.
+
 2004-05-01  Hans Breuer  <hans@breuer.org>
 
        * glib/gnulib/Makefile.am : added makefile.msc to EXTRA_DIST

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3bc3c983ab1582ac928deb69dc9f33138bb60e49..877a9bb55a64e8043b73d631896108b5032d3770 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun May  2 03:51:59 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/gtypes.h: check for __pentium4__ when deciding whether to
+       use bswap for GUINT32_SWAP_LE_BE_IA32(). Fixes bug #141620.
+
 2004-05-01  Hans Breuer  <hans@breuer.org>
 
        * glib/gnulib/Makefile.am : added makefile.msc to EXTRA_DIST

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3bc3c983ab1582ac928deb69dc9f33138bb60e49..877a9bb55a64e8043b73d631896108b5032d3770 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun May  2 03:51:59 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/gtypes.h: check for __pentium4__ when deciding whether to
+       use bswap for GUINT32_SWAP_LE_BE_IA32(). Fixes bug #141620.
+
 2004-05-01  Hans Breuer  <hans@breuer.org>
 
        * glib/gnulib/Makefile.am : added makefile.msc to EXTRA_DIST

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3bc3c983ab1582ac928deb69dc9f33138bb60e49..877a9bb55a64e8043b73d631896108b5032d3770 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun May  2 03:51:59 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/gtypes.h: check for __pentium4__ when deciding whether to
+       use bswap for GUINT32_SWAP_LE_BE_IA32(). Fixes bug #141620.
+
 2004-05-01  Hans Breuer  <hans@breuer.org>
 
        * glib/gnulib/Makefile.am : added makefile.msc to EXTRA_DIST

diff --git a/glib/gtypes.h b/glib/gtypes.h
index a7ec358760277fdc2a3b1c08b2375c2745c0e9b6..aca841feadce90601156adab6456f41fcc869125 100644 (file)
--- a/glib/gtypes.h
+++ b/glib/gtypes.h
@@ -156,7 +156,7 @@ typedef void            (*GFreeFunc)            (gpointer       data);
            __v; }))
 #    if !defined (__i486__) && !defined (__i586__) \
        && !defined (__pentium__) && !defined (__i686__) \
-       && !defined (__pentiumpro__)
+       && !defined (__pentiumpro__) && !defined (__pentium4__)
 #       define GUINT32_SWAP_LE_BE_IA32(val) \
          (__extension__                                        \
           ({ register guint32 __v, __x = ((guint32) (val));    \