ardour/livetrax
13
0
Fork 0
Code

Update atomic/volatile compat

Browse Source 
With glib 2.64, volatile gint produce annoying Wcast-qual
compiler warnings with mingw/gcc-8.

Even though the the build succeeds, and only glib 2.68+
requires non-volatile atomics this results in a much
cleaner build-log.
This commit is contained in:
Robin Gareus 2021-08-16 04:26:55 +02:00
parent 55211b8dd6
commit baf5a13f17
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/pbd/pbd/g_atomic_compat.h
View File

@ -30,7 +30,7 @@
* Older versions of glib and older compilers still expect a volatile qualifier and print * Older versions of glib and older compilers still expect a volatile qualifier and print
* "cast from type 'volatile long int*' to type 'long int*' casts away qualifiers [-Wcast-qual]" * "cast from type 'volatile long int*' to type 'long int*' casts away qualifiers [-Wcast-qual]"
*/ */
#if defined HAVE_GLIB_2_68 && (defined(__cplusplus) && __cplusplus >= 201103L) #if defined HAVE_GLIB_2_64 && (defined(__cplusplus) && __cplusplus >= 201103L)
# define GATOMIC_QUAL # define GATOMIC_QUAL
#else #else
# define GATOMIC_QUAL volatile # define GATOMIC_QUAL volatile

2
wscript
View File

@ -1146,7 +1146,7 @@ def configure(conf):
conf.env.append_value('LDFLAGS', '-L/usr/X11R6/lib') conf.env.append_value('LDFLAGS', '-L/usr/X11R6/lib')
autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.28', mandatory=True) autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', atleast_version='2.28', mandatory=True)
autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB_2_68', atleast_version='2.68', mandatory=False) autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB_2_64', atleast_version='2.64', mandatory=False)
autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2', mandatory=True) autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.2', mandatory=True)
autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0', mandatory=True) autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0', mandatory=True)
autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18', mandatory=True) autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18', mandatory=True)