summaryrefslogtreecommitdiff
path: root/glib
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjell.ahlstedt@bredband.net>2015-12-05 11:51:36 +0100
committerKjell Ahlstedt <kjell.ahlstedt@bredband.net>2015-12-05 11:51:36 +0100
commitc3101a0bc7c5d0d2cca7c2c7e6f7e6d4882f5cd1 (patch)
treeec43315a802da7bdcfb0aa443aac5d944d2620cd /glib
parent1b5cab8581c9c412ea2cf3f5f7b5de0add9d870d (diff)
downloadglibmm-c3101a0bc7c5d0d2cca7c2c7e6f7e6d4882f5cd1.tar.gz
Fix the build with --disable-deprecated-api
* examples/thread/threadpool.cc: If --disable-deprecated-api, just print a message and exit. * gio/src/<several>.hg: Add _CONFIGINCLUDE(giommconfig.h). * gio/src/menuitem.ccg: Add a missing _DEPRECATE_IFDEF_START/_END pair. * glib/glibmm/sarray.h: * glib/glibmm/threadpool.[cc|h]: #include <glibmmconfig.h> before ifndef GLIBMM_DISABLE_DEPRECATED. * glib/src/filelist.am: Remove glibmm_files_deprecated_hg. List deprecated files in glibmm_files_any_hg. The config file must be included before #ifndef xxx_DISABLE_DEPRECATED both in the .h file and in the .cc file, or else deprecated API is not properly disabled by --disable-deprecated-api.
Diffstat (limited to 'glib')
-rw-r--r--glib/glibmm/sarray.h6
-rw-r--r--glib/glibmm/threadpool.cc4
-rw-r--r--glib/glibmm/threadpool.h5
-rw-r--r--glib/src/filelist.am16
4 files changed, 12 insertions, 19 deletions
diff --git a/glib/glibmm/sarray.h b/glib/glibmm/sarray.h
index 6226f50e..2ec2fea6 100644
--- a/glib/glibmm/sarray.h
+++ b/glib/glibmm/sarray.h
@@ -1,9 +1,6 @@
-// -*- c++ -*-
#ifndef _GLIBMM_SARRAY_H
#define _GLIBMM_SARRAY_H
-/* $Id$ */
-
/* array.h
*
* Copyright (C) 2002 The gtkmm Development Team
@@ -23,6 +20,8 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <glibmmconfig.h>
+
#ifndef GLIBMM_DISABLE_DEPRECATED
#include <glibmm/arrayhandle.h>
#include <glibmm/ustring.h>
@@ -39,4 +38,3 @@ typedef Glib::ArrayHandle<Glib::ustring> SArray;
#endif //GLIBMM_DISABLE_DEPRECATED
#endif // _GLIBMM_SARRAY_H
-
diff --git a/glib/glibmm/threadpool.cc b/glib/glibmm/threadpool.cc
index 198e7ed4..f0218154 100644
--- a/glib/glibmm/threadpool.cc
+++ b/glib/glibmm/threadpool.cc
@@ -1,5 +1,3 @@
-// -*- c++ -*-
-
/* Copyright (C) 2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -17,9 +15,9 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <glibmmconfig.h>
#ifndef GLIBMM_DISABLE_DEPRECATED
-#include <glibmmconfig.h>
#include <glibmm/threadpool.h>
#include <glibmm/exceptionhandler.h>
#include <glibmm/threads.h>
diff --git a/glib/glibmm/threadpool.h b/glib/glibmm/threadpool.h
index 8b920107..fbf4739c 100644
--- a/glib/glibmm/threadpool.h
+++ b/glib/glibmm/threadpool.h
@@ -1,9 +1,6 @@
-// -*- c++ -*-
#ifndef _GLIBMM_THREADPOOL_H
#define _GLIBMM_THREADPOOL_H
-/* $Id$ */
-
/* Copyright (C) 2002 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -21,6 +18,8 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <glibmmconfig.h>
+
#ifndef GLIBMM_DISABLE_DEPRECATED
#include <sigc++/sigc++.h>
diff --git a/glib/src/filelist.am b/glib/src/filelist.am
index 94341328..a35ffdc1 100644
--- a/glib/src/filelist.am
+++ b/glib/src/filelist.am
@@ -35,26 +35,24 @@ glibmm_files_any_hg = \
regex.hg \
shell.hg \
spawn.hg \
+ thread.hg \
threads.hg \
timezone.hg \
unicode.hg \
uriutils.hg \
+ valuearray.hg \
variant.hg \
variantdict.hg \
variantiter.hg \
varianttype.hg
-glibmm_files_deprecated_hg = \
- thread.hg \
- valuearray.hg
-
-if DISABLE_DEPRECATED_API
+## Unconditionally used files,
+## deprecated files (even if configured with --disable-deprecated-api),
+## if there are architecture-specific files, only those for the present architecture.
glibmm_files_used_hg = $(glibmm_files_any_hg)
-else
-glibmm_files_used_hg = $(glibmm_files_any_hg) $(glibmm_files_deprecated_hg)
-endif
-glibmm_files_hg = $(glibmm_files_any_hg) $(glibmm_files_deprecated_hg)
+## All .hg files
+glibmm_files_hg = $(glibmm_files_any_hg)
glibmm_files_ccg = $(glibmm_files_hg:.hg=.ccg)