get rid of duplicate #g_htonl and friends in the NATIVE_WIN32 part

-Yosh

diff --git a/ChangeLog b/ChangeLog
index 552ef24437ac1a5ff7f41cc2aa9d90c5cf7c6b48..8e34d63b893304ebdf3a9d531622bc449ed44713 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 27 00:27:31 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: get rid of duplicate #g_htonl and friends in the
+       NATIVE_WIN32 part
+
 Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glibconfig.h.win32

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 552ef24437ac1a5ff7f41cc2aa9d90c5cf7c6b48..8e34d63b893304ebdf3a9d531622bc449ed44713 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Tue Oct 27 00:27:31 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: get rid of duplicate #g_htonl and friends in the
+       NATIVE_WIN32 part
+
 Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glibconfig.h.win32

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 552ef24437ac1a5ff7f41cc2aa9d90c5cf7c6b48..8e34d63b893304ebdf3a9d531622bc449ed44713 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Oct 27 00:27:31 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: get rid of duplicate #g_htonl and friends in the
+       NATIVE_WIN32 part
+
 Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glibconfig.h.win32

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 552ef24437ac1a5ff7f41cc2aa9d90c5cf7c6b48..8e34d63b893304ebdf3a9d531622bc449ed44713 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Tue Oct 27 00:27:31 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: get rid of duplicate #g_htonl and friends in the
+       NATIVE_WIN32 part
+
 Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glibconfig.h.win32

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 552ef24437ac1a5ff7f41cc2aa9d90c5cf7c6b48..8e34d63b893304ebdf3a9d531622bc449ed44713 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Oct 27 00:27:31 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: get rid of duplicate #g_htonl and friends in the
+       NATIVE_WIN32 part
+
 Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glibconfig.h.win32

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 552ef24437ac1a5ff7f41cc2aa9d90c5cf7c6b48..8e34d63b893304ebdf3a9d531622bc449ed44713 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Oct 27 00:27:31 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: get rid of duplicate #g_htonl and friends in the
+       NATIVE_WIN32 part
+
 Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glibconfig.h.win32

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 552ef24437ac1a5ff7f41cc2aa9d90c5cf7c6b48..8e34d63b893304ebdf3a9d531622bc449ed44713 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Oct 27 00:27:31 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: get rid of duplicate #g_htonl and friends in the
+       NATIVE_WIN32 part
+
 Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glibconfig.h.win32

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 552ef24437ac1a5ff7f41cc2aa9d90c5cf7c6b48..8e34d63b893304ebdf3a9d531622bc449ed44713 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Oct 27 00:27:31 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * glib.h: get rid of duplicate #g_htonl and friends in the
+       NATIVE_WIN32 part
+
 Mon Oct 26 22:42:01 PST 1998 Manish Singh <yosh@gimp.org>
 
        * glibconfig.h.win32

diff --git a/glib.h b/glib.h
index 0a4e31e89ea185cac0dd96f09203ef752570e870..64ed88ed87237b2f09c42f6ae021046a5d37eb03 100644 (file)
--- a/glib.h
+++ b/glib.h
@@ -2321,25 +2321,9 @@ gint             gwin_closedir   (DIR            *dir);
 
 #endif /* _MSC_VER */
 
-#define g_ntohl(x) \
-  ((guint32)((((guint32)(x) & 0x000000ffU) << 24) | \
-            (((guint32)(x) & 0x0000ff00U) <<  8) | \
-            (((guint32)(x) & 0x00ff0000U) >>  8) | \
-            (((guint32)(x) & 0xff000000U) >> 24)))
-
-#define g_htonl(x)     g_ntohl(x)
-
-#define g_ntohs(x) \
-  ((guint16)((((guint16)(x) & 0x00ff) << 8) | \
-            (((guint16)(x) & 0xff00) >> 8)))
-
-#define g_htons(x)     g_ntohs(x)
-
 #endif /* NATIVE_WIN32 */
 
 
-
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

diff --git a/glib/glib.h b/glib/glib.h
index 0a4e31e89ea185cac0dd96f09203ef752570e870..64ed88ed87237b2f09c42f6ae021046a5d37eb03 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -2321,25 +2321,9 @@ gint             gwin_closedir   (DIR            *dir);
 
 #endif /* _MSC_VER */
 
-#define g_ntohl(x) \
-  ((guint32)((((guint32)(x) & 0x000000ffU) << 24) | \
-            (((guint32)(x) & 0x0000ff00U) <<  8) | \
-            (((guint32)(x) & 0x00ff0000U) >>  8) | \
-            (((guint32)(x) & 0xff000000U) >> 24)))
-
-#define g_htonl(x)     g_ntohl(x)
-
-#define g_ntohs(x) \
-  ((guint16)((((guint16)(x) & 0x00ff) << 8) | \
-            (((guint16)(x) & 0xff00) >> 8)))
-
-#define g_htons(x)     g_ntohs(x)
-
 #endif /* NATIVE_WIN32 */
 
 
-
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */