Remove a couple of redundant GLib version guards (libvips#3680)

kleisauke · web-flow · commit 57b7b9e23370 · 2023-09-24T13:06:31.000+02:00
The minimum required GLib version was raised to 2.52, making these
guards unnecessary.
diff --git a/libvips/foreign/pforeign.h b/libvips/foreign/pforeign.h
@@ -35,15 +35,6 @@
 extern "C" {
 #endif /*__cplusplus*/
 
-/* Slow and horrid version if there's no recent glib.
- */
-#if !GLIB_CHECK_VERSION(2, 48, 0)
-#define g_uint_checked_mul(dest, a, b) ( \
-	((guint64) a * b) > UINT_MAX \
-		? (*dest = UINT_MAX, FALSE) \
-		: (*dest = a * b, TRUE))
-#endif /*!GLIB_CHECK_VERSION(2, 48, 0)*/
-
 /* We've seen real images with 28 chunks, so set 50.
  */
 #define MAX_PNG_TEXT_CHUNKS 50
diff --git a/libvips/iofuncs/init.c b/libvips/iofuncs/init.c
@@ -489,14 +489,6 @@ vips_init(const char *argv0)
 	vips__buffer_init();
 	vips__meta_init();
 
-	/* This does an unsynchronised static hash table init on first call --
-	 * we have to make sure we do this single-threaded. See:
-	 * https://github.com/openslide/openslide/issues/161
-	 */
-#if !GLIB_CHECK_VERSION(2, 48, 1)
-	(void) g_get_language_names();
-#endif
-
 	if (!vips__global_lock)
 		vips__global_lock = vips_g_mutex_new();
 
diff --git a/libvips/iofuncs/thread.c b/libvips/iofuncs/thread.c
@@ -182,85 +182,6 @@ vips_g_thread_new(const char *domain, GThreadFunc func, gpointer data)
 	return thread;
 }
 
-static int
-get_num_processors(void)
-{
-#if GLIB_CHECK_VERSION(2, 48, 1)
-	/* We could use g_get_num_processors when GLib >= 2.48.1, see:
-	 * https://gitlab.gnome.org/GNOME/glib/commit/999711abc82ea3a698d05977f9f91c0b73957f7f
-	 * https://gitlab.gnome.org/GNOME/glib/commit/2149b29468bb99af3c29d5de61f75aad735082dc
-	 */
-	return g_get_num_processors();
-#else
-	int nproc;
-
-	nproc = 1;
-
-#ifdef G_OS_UNIX
-
-#if defined(HAVE_UNISTD_H) && defined(_SC_NPROCESSORS_ONLN)
-	{
-		/* POSIX style.
-		 */
-		int x;
-
-		x = sysconf(_SC_NPROCESSORS_ONLN);
-		if (x > 0)
-			nproc = x;
-	}
-#elif defined HW_NCPU
-	{
-		/* BSD style.
-		 */
-		int x;
-		size_t len = sizeof(x);
-
-		sysctl((int[2]){ CTL_HW, HW_NCPU }, 2, &x, &len, NULL, 0);
-		if (x > 0)
-			nproc = x;
-	}
-#endif
-
-	/* libgomp has some very complex code on Linux to count the number of
-	 * processors available to the current process taking pthread affinity
-	 * into account, but we don't attempt that here. Perhaps we should?
-	 */
-
-#endif /*G_OS_UNIX*/
-
-#ifdef G_OS_WIN32
-	{
-		/* Count the CPUs currently available to this process.
-		 */
-		SYSTEM_INFO sysinfo;
-		DWORD_PTR process_cpus;
-		DWORD_PTR system_cpus;
-
-		/* This *never* fails, use it as fallback
-		 */
-		GetNativeSystemInfo(&sysinfo);
-		nproc = (int) sysinfo.dwNumberOfProcessors;
-
-		if (GetProcessAffinityMask(GetCurrentProcess(),
-				&process_cpus, &system_cpus)) {
-			unsigned int af_count;
-
-			for (af_count = 0; process_cpus != 0; process_cpus >>= 1)
-				if (process_cpus & 1)
-					af_count++;
-
-			/* Prefer affinity-based result, if available
-			 */
-			if (af_count > 0)
-				nproc = af_count;
-		}
-	}
-#endif /*G_OS_WIN32*/
-
-	return nproc;
-#endif /*!GLIB_CHECK_VERSION(2, 48, 1)*/
-}
-
 /* The default concurrency, set by the environment variable VIPS_CONCURRENCY,
  * or if that is not set, the number of threads available on the host machine.
  */
@@ -284,7 +205,7 @@ vips__concurrency_get_default(void)
 		(x = atoi(str)) > 0)
 		nthr = x;
 	else
-		nthr = get_num_processors();
+		nthr = g_get_num_processors();
 
 	if (nthr < 1 ||
 		nthr > MAX_THREADS) {
