luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-22 21:40:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic

Browse Source
This commit is contained in:
Behdad Esfahbod 2010-03-08 14:28:23 -05:00
parent f6166be24d
commit c69e6fd837
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glib/gmem.h
View File

@ -83,27 +83,29 @@ gpointer g_try_realloc_n (gpointer mem,
# define _G_NEW(struct_type, n_structs, func) \ # define _G_NEW(struct_type, n_structs, func) \
(struct_type *) (__extension__ ({ \ (struct_type *) (__extension__ ({ \
gsize __n = (gsize) (n_structs); \ gsize __n = (gsize) (n_structs); \
gsize __s = sizeof (struct_type); \
gpointer __p; \ gpointer __p; \
if (sizeof (struct_type) == 1) \ if (__s == 1) \
__p = g_##func (__n); \ __p = g_##func (__n); \
else if (__builtin_constant_p (__n) && \ else if (__builtin_constant_p (__n) && \
__n <= G_MAXSIZE / sizeof (struct_type)) \ __n <= G_MAXSIZE / __s) \
__p = g_##func (__n * sizeof (struct_type)); \ __p = g_##func (__n * __s); \
else \ else \
__p = g_##func##_n (__n, sizeof (struct_type)); \ __p = g_##func##_n (__n, __s); \
__p; \ __p; \
})) }))
# define _G_RENEW(struct_type, mem, n_structs, func) \ # define _G_RENEW(struct_type, mem, n_structs, func) \
(struct_type *) (__extension__ ({ \ (struct_type *) (__extension__ ({ \
gsize __n = (gsize) (n_structs); \ gsize __n = (gsize) (n_structs); \
gsize __s = sizeof (struct_type); \
gpointer __p = (gpointer) (mem); \ gpointer __p = (gpointer) (mem); \
if (sizeof (struct_type) == 1) \ if (__s == 1) \
__p = g_##func (__p, __n); \ __p = g_##func (__p, __n); \
else if (__builtin_constant_p (__n) && \ else if (__builtin_constant_p (__n) && \
__n <= G_MAXSIZE / sizeof (struct_type)) \ __n <= G_MAXSIZE / __s) \
__p = g_##func (__p, __n * sizeof (struct_type)); \ __p = g_##func (__p, __n * __s); \
else \ else \
__p = g_##func##_n (__p, __n, sizeof (struct_type));\ __p = g_##func##_n (__p, __n, __s); \
__p; \ __p; \
})) }))