luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 23:13:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1377-g-assert-cmpfloat' into 'master'

Browse Source 
Resolve "g_assert_cmpfloat trips -Wdouble-promotion on Clang"

Closes #1377

See merge request GNOME/glib!127
This commit is contained in:
Philip Withnall
2018-06-21 10:35:37 +00:00
parent b9aed426d1 9e46b2ef11
commit 6e784963f4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gio/Makefile.am
View File

@@ -627,13 +627,13 @@ libgio_objc_2_0_la_CFLAGS = $(libgio_2_0_la_CFLAGS) -xobjective-c
libgio_objc_2_0_la_CPPFLAGS = $(libgio_2_0_la_CPPFLAGS)
libgio_objc_2_0_la_LDFLAGS = $(libgio_2_0_la_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,AppKit
libgio_objc_2_0_la_SOURCES = \
gnextstepsettingsbackend.c \
gosxcontenttype.c \
gosxappinfo.c \
gosxappinfo.h
$(abs_builddir)/gnextstepsettingsbackend.c \
$(abs_builddir)/gosxcontenttype.c \
$(abs_builddir)/gosxappinfo.c \
$(abs_builddir)/gosxappinfo.h
if MAC_OS_X_9
libgio_objc_2_0_la_SOURCES += \
gcocoanotificationbackend.c
$(abs_builddir)/gcocoanotificationbackend.c
endif
noinst_LTLIBRARIES += libgio-objc-2.0.la

2
glib/gtestutils.h
View File

@@ -64,7 +64,7 @@ typedef void (*GTestFixtureFunc) (gpointer fixture,
#n1 " " #cmp " " #n2, (long double) __n1, #cmp, (long double) __n2, 'x'); \
} G_STMT_END
#define g_assert_cmpfloat(n1,cmp,n2) G_STMT_START { \
long double __n1 = (n1), __n2 = (n2); \
long double __n1 = (long double) (n1), __n2 = (long double) (n2); \
if (__n1 cmp __n2) ; else \
g_assertion_message_cmpnum (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
#n1 " " #cmp " " #n2, (long double) __n1, #cmp, (long double) __n2, 'f'); \