mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-26 22:16:16 +01:00
get rid of duplicate #g_htonl and friends in the NATIVE_WIN32 part
-Yosh
This commit is contained in:
parent
7470df9f23
commit
167b4fbbfc
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
16
glib.h
16
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 */
|
||||
|
16
glib/glib.h
16
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 */
|
||||
|
Loading…
Reference in New Issue
Block a user