From 167b4fbbfc90cdd220db856a31f8c6634dbdfb35 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Tue, 27 Oct 1998 08:33:27 +0000 Subject: [PATCH] get rid of duplicate #g_htonl and friends in the NATIVE_WIN32 part -Yosh --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib.h | 16 ---------------- glib/glib.h | 16 ---------------- 10 files changed, 40 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 552ef24..8e34d63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 27 00:27:31 PST 1998 Manish Singh + + * 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 * glibconfig.h.win32 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 552ef24..8e34d63 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Tue Oct 27 00:27:31 PST 1998 Manish Singh + + * 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 * glibconfig.h.win32 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 552ef24..8e34d63 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Oct 27 00:27:31 PST 1998 Manish Singh + + * 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 * glibconfig.h.win32 diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 552ef24..8e34d63 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Tue Oct 27 00:27:31 PST 1998 Manish Singh + + * 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 * glibconfig.h.win32 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 552ef24..8e34d63 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Oct 27 00:27:31 PST 1998 Manish Singh + + * 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 * glibconfig.h.win32 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 552ef24..8e34d63 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Oct 27 00:27:31 PST 1998 Manish Singh + + * 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 * glibconfig.h.win32 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 552ef24..8e34d63 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Oct 27 00:27:31 PST 1998 Manish Singh + + * 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 * glibconfig.h.win32 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 552ef24..8e34d63 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Oct 27 00:27:31 PST 1998 Manish Singh + + * 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 * glibconfig.h.win32 diff --git a/glib.h b/glib.h index 0a4e31e..64ed88e 100644 --- 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 0a4e31e..64ed88e 100644 --- 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 */ -- 2.7.4