luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 06:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'threads-none' into 'master'

Browse Source 
Remove unused THREADS_NONE

See merge request GNOME/glib!110
This commit is contained in:
Christoph Reiter 2018-06-15 04:55:17 +00:00
commit ee5a37f657
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -2069,13 +2069,11 @@ AS_IF([test x$have_threads = xposix], [
AC_DEFINE([THREADS_WIN32], [1], [Use w32 threads]) AC_DEFINE([THREADS_WIN32], [1], [Use w32 threads])
g_threads_impl="WIN32" g_threads_impl="WIN32"
], [ ], [
AC_DEFINE([THREADS_NONE], [1], [Use no threads])
g_threads_impl="NONE" g_threads_impl="NONE"
G_THREAD_LIBS=error G_THREAD_LIBS=error
]) ])
AM_CONDITIONAL(THREADS_POSIX, [test "$g_threads_impl" = "POSIX"]) AM_CONDITIONAL(THREADS_POSIX, [test "$g_threads_impl" = "POSIX"])
AM_CONDITIONAL(THREADS_WIN32, [test "$g_threads_impl" = "WIN32"]) AM_CONDITIONAL(THREADS_WIN32, [test "$g_threads_impl" = "WIN32"])
AM_CONDITIONAL(THREADS_NONE, [test "$g_threads_impl" = "NONE"])
if test "x$G_THREAD_LIBS" = xerror; then if test "x$G_THREAD_LIBS" = xerror; then
AC_MSG_ERROR($LIBS_NOT_FOUND_1$have_threads$LIBS_NOT_FOUND_2) AC_MSG_ERROR($LIBS_NOT_FOUND_1$have_threads$LIBS_NOT_FOUND_2)

1
meson.build
View File

@ -1776,7 +1776,6 @@ have_sh = find_program('sh', required : false).found() # For glib-gettextize
# (we add them for now to minimise the diff) # (we add them for now to minimise the diff)
glib_conf.set('HAVE_DLFCN_H', 1) glib_conf.set('HAVE_DLFCN_H', 1)
glib_conf.set('STDC_HEADERS', 1) glib_conf.set('STDC_HEADERS', 1)
# THREADS_NONE
glib_conf.set('SIZEOF___INT64', 8) glib_conf.set('SIZEOF___INT64', 8)
# FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578 # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578