diff options
79 files changed, 268 insertions, 296 deletions
diff --git a/configure.ac b/configure.ac index 2f35cbe..3501617 100644 --- a/configure.ac +++ b/configure.ac @@ -297,8 +297,8 @@ fi AM_CONDITIONAL([TRACK_GOBJECT_LEAKS], [test "x$with_gobject_leak_tracker" = "xyes"]) if test "x$with_gobject_leak_tracker" = "xyes"; then - AC_DEFINE(TRACK_GOBJECT_LEAKS, 1, - [Define to 1 to enable code for dumping remaining GObject instances at exit.]) + # Enable code for dumping remaining GObject instances at exit + CPPFLAGS="$CPPFLAGS -DTRACK_GOBJECT_LEAKS" enable_debug="yes" fi @@ -351,8 +351,8 @@ R AM_CONDITIONAL([BUILD_GTK_SUPPORT], [test "x$enable_gtk_support" = "xyes"]) if test "x$BUILD_GTK_SUPPORT_TRUE" = "x"; then - AC_DEFINE(HAVE_GTK_SUPPORT, 1, - [Define to 1 if the GTK support is available and enabled.]) + # GTK support is available and enabled + CPPFLAGS="$CPPFLAGS -DINCLUDE_GTK_SUPPORT" fi @@ -470,8 +470,8 @@ AC_SUBST(LIBSSL_LIBS) AM_CONDITIONAL([BUILD_CURL_SUPPORT], [test "x$enable_curl_support" = "xyes"]) if test "x$BUILD_CURL_SUPPORT_TRUE" = "x"; then - AC_DEFINE(HAVE_CURL_SUPPORT, 1, - [Define to 1 if the cURL support is available and enabled.]) + # cURL support is available and enabled + CPPFLAGS="$CPPFLAGS -DINCLUDE_CURL_SUPPORT" fi @@ -512,8 +512,8 @@ AC_SUBST(LIBYAML_LIBS) AM_CONDITIONAL([BUILD_MAGIC_SUPPORT], [test "x$enable_magic_support" = "xyes"]) if test "x$BUILD_MAGIC_SUPPORT_TRUE" = "x"; then - AC_DEFINE(HAVE_MAGIC_SUPPORT, 1, - [Define to 1 if the magic support is available and enabled.]) + # Magic support is available and enabled + CPPFLAGS="$CPPFLAGS -DINCLUDE_MAGIC_SUPPORT" fi @@ -547,8 +547,8 @@ fi AM_CONDITIONAL([BUILD_PYTHON3_BINDINGS], [test "x$enable_python_bindings$python3_cfg_binary" = "xyesyes"]) if test "x$BUILD_PYTHON3_BINDINGS_TRUE" = "x"; then - AC_DEFINE(HAVE_PYTHON3_BINDINGS, 1, - [Define to 1 if the Python bindings are available and enabled.]) + # Python bindings are available and enabled + CPPFLAGS="$CPPFLAGS -DINCLUDE_PYTHON3_BINDINGS" fi if test "x$python3_cfg_binary" = "xyes"; then diff --git a/plugins/arm/core.c b/plugins/arm/core.c index c270c85..1c1c6bc 100644 --- a/plugins/arm/core.c +++ b/plugins/arm/core.c @@ -24,17 +24,16 @@ #include "core.h" -#include <config.h> #include <plugins/self.h> -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # include "python/module.h" #endif #include "v7/core.h" -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ @@ -66,7 +65,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) result = init_armv7_core(); -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS if (result) result = add_arch_arm_module_to_python_module(); #endif diff --git a/plugins/bhash/core.c b/plugins/bhash/core.c index 91a0bf2..eb05893 100644 --- a/plugins/bhash/core.c +++ b/plugins/bhash/core.c @@ -24,16 +24,15 @@ #include "core.h" -#include <config.h> #include <plugins/self.h> -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # include "python/module.h" #endif -#ifdef HAVE_PYTHON3_BINDINGS_ +#ifdef INCLUDE_PYTHON3_BINDINGS_ # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ @@ -63,7 +62,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) { bool result; /* Bilan à retourner */ -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS result = add_bhash_module_to_python_module(); #else result = true; diff --git a/plugins/bootimg/core.c b/plugins/bootimg/core.c index 9c4bc45..25b21db 100644 --- a/plugins/bootimg/core.c +++ b/plugins/bootimg/core.c @@ -24,18 +24,17 @@ #include "core.h" -#include <config.h> #include <core/global.h> #include <plugins/self.h> #include "format.h" -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # include "python/module.h" #endif -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ @@ -65,7 +64,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) { bool result; /* Bilan à retourner */ -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS result = add_format_bootimg_module_to_python_module(); #else result = true; diff --git a/plugins/dalvik/core.c b/plugins/dalvik/core.c index 2294ed4..8344825 100644 --- a/plugins/dalvik/core.c +++ b/plugins/dalvik/core.c @@ -24,7 +24,6 @@ #include "core.h" -#include <config.h> #include <plugins/self.h> @@ -32,13 +31,13 @@ #include "operands/args.h" #include "operands/pool.h" #include "operands/register.h" -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # include "python/module.h" #endif #include "v35/core.h" -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ @@ -100,7 +99,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) result = init_dalvik35_core(); -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS if (result) result = add_arch_dalvik_module_to_python_module(); #endif diff --git a/plugins/dex/core.c b/plugins/dex/core.c index 22ebfff..1101a89 100644 --- a/plugins/dex/core.c +++ b/plugins/dex/core.c @@ -24,18 +24,17 @@ #include "core.h" -#include <config.h> #include <core/global.h> #include <plugins/self.h> #include "format.h" -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # include "python/module.h" #endif -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ @@ -65,7 +64,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) { bool result; /* Bilan à retourner */ -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS result = add_format_dex_module_to_python_module(); #else result = true; diff --git a/plugins/dexbnf/core.c b/plugins/dexbnf/core.c index 37e5a15..07e7545 100644 --- a/plugins/dexbnf/core.c +++ b/plugins/dexbnf/core.c @@ -24,18 +24,17 @@ #include "core.h" -#include <config.h> #include <core/demanglers.h> #include <plugins/self.h> #include "demangler.h" -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # include "python/module.h" #endif -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ @@ -67,7 +66,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) result = register_demangler_type(G_TYPE_DEX_DEMANGLER); -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS if (result) result = add_mangling_dexbnf_module_to_python_module(); #endif diff --git a/plugins/dwarf/core.c b/plugins/dwarf/core.c index bf1e812..7b62fb9 100644 --- a/plugins/dwarf/core.c +++ b/plugins/dwarf/core.c @@ -24,14 +24,13 @@ #include "core.h" -#include <config.h> #include <plugins/self.h> #include "format.h" -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ diff --git a/plugins/elf/core.c b/plugins/elf/core.c index 1e98aba..bd829af 100644 --- a/plugins/elf/core.c +++ b/plugins/elf/core.c @@ -24,18 +24,17 @@ #include "core.h" -#include <config.h> #include <core/global.h> #include <plugins/self.h> #include "format.h" -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # include "python/module.h" #endif -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ @@ -65,7 +64,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) { bool result; /* Bilan à retourner */ -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS result = add_format_elf_module_to_python_module(); #else result = true; diff --git a/plugins/itanium/core.c b/plugins/itanium/core.c index dd74f53..3f3feb0 100644 --- a/plugins/itanium/core.c +++ b/plugins/itanium/core.c @@ -24,18 +24,17 @@ #include "core.h" -#include <config.h> #include <core/demanglers.h> #include <plugins/self.h> #include "demangler.h" -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # include "python/module.h" #endif -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ @@ -67,7 +66,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) result = register_demangler_type(G_TYPE_ITANIUM_DEMANGLER); -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS if (result) result = add_mangling_itanium_module_to_python_module(); #endif diff --git a/plugins/javadesc/core.c b/plugins/javadesc/core.c index e7b4773..420d9f5 100644 --- a/plugins/javadesc/core.c +++ b/plugins/javadesc/core.c @@ -24,18 +24,17 @@ #include "core.h" -#include <config.h> #include <core/demanglers.h> #include <plugins/self.h> #include "demangler.h" -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # include "python/module.h" #endif -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ @@ -67,7 +66,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) result = register_demangler_type(G_TYPE_JAVA_DEMANGLER); -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS if (result) result = add_mangling_javadesc_module_to_python_module(); #endif diff --git a/plugins/kaitai/core.c b/plugins/kaitai/core.c index c795492..7483fbc 100644 --- a/plugins/kaitai/core.c +++ b/plugins/kaitai/core.c @@ -27,12 +27,12 @@ #include <plugins/self.h> -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # include "python/module.h" #endif -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ @@ -64,7 +64,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) result = true; -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS if (result) result = add_kaitai_module_to_python_module(); diff --git a/plugins/pe/core.c b/plugins/pe/core.c index aa51c18..ddbacf5 100644 --- a/plugins/pe/core.c +++ b/plugins/pe/core.c @@ -24,18 +24,17 @@ #include "core.h" -#include <config.h> #include <core/global.h> #include <plugins/self.h> #include "format.h" -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # include "python/module.h" #endif -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ @@ -65,7 +64,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) { bool result; /* Bilan à retourner */ -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS result = add_format_pe_module_to_python_module(); #else result = true; diff --git a/plugins/pychrysalide/analysis/loaded.c b/plugins/pychrysalide/analysis/loaded.c index 6e30ad2..a2bf13f 100644 --- a/plugins/pychrysalide/analysis/loaded.c +++ b/plugins/pychrysalide/analysis/loaded.c @@ -66,7 +66,7 @@ static bool py_loaded_content_analyze_wrapper(GLoadedContent *, bool, bool, wgro /* Fournit le désignation associée à l'élément chargé. */ static char *py_loaded_content_describe_wrapper(const GLoadedContent *, bool); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Détermine le nombre de vues disponibles pour un contenu. */ static unsigned int py_loaded_content_count_views_wrapper(const GLoadedContent *); @@ -102,7 +102,7 @@ static PyObject *py_loaded_content_describe(PyObject *, PyObject *); /* Etablit une liste d'obscurcissements présents. */ static PyObject *py_loaded_content_detect_obfuscators(PyObject *, PyObject *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Détermine le nombre de vues disponibles pour un contenu. */ static PyObject *py_loaded_content_count_views(PyObject *, PyObject *); @@ -242,7 +242,7 @@ static void py_loaded_content_init_gclass(GLoadedContentClass *class, gpointer u class->describe = py_loaded_content_describe_wrapper; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT class->count_views = py_loaded_content_count_views_wrapper; class->get_view_name = py_loaded_content_get_view_name_wrapper; class->build_def_view = py_loaded_content_build_default_view_wrapper; @@ -548,7 +548,7 @@ static char *py_loaded_content_describe_wrapper(const GLoadedContent *content, b } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -1123,7 +1123,7 @@ static PyObject *py_loaded_content_detect_obfuscators(PyObject *self, PyObject * } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -1509,7 +1509,7 @@ PyTypeObject *get_python_loaded_content_type(void) LOADED_CONTENT_GET_CONTENT_CLASS_WRAPPER, LOADED_CONTENT_ANALYZE_WRAPPER, LOADED_CONTENT_DESCRIBE_WRAPPER, -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT LOADED_CONTENT_COUNT_VIEWS_WRAPPER, LOADED_CONTENT_GET_VIEW_NAME_WRAPPER, LOADED_CONTENT_BUILD_DEFAULT_VIEW_WRAPPER, @@ -1520,7 +1520,7 @@ PyTypeObject *get_python_loaded_content_type(void) LOADED_CONTENT_ANALYZE_AND_WAIT_METHOD, LOADED_CONTENT_DESCRIBE_METHOD, LOADED_CONTENT_DETECT_OBFUSCATORS_METHOD, -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT LOADED_CONTENT_COUNT_VIEWS_METHOD, LOADED_CONTENT_GET_VIEW_NAME_METHOD, LOADED_CONTENT_BUILD_DEFAULT_VIEW_METHOD, @@ -1586,7 +1586,7 @@ bool ensure_python_loaded_content_is_registered(void) dict = PyModule_GetDict(module); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT if (!ensure_python_named_widget_is_registered()) return false; #endif diff --git a/plugins/pychrysalide/arch/operand.c b/plugins/pychrysalide/arch/operand.c index abd1f06..0aee4f7 100644 --- a/plugins/pychrysalide/arch/operand.c +++ b/plugins/pychrysalide/arch/operand.c @@ -60,7 +60,7 @@ static GArchOperand *py_arch_operand_get_inner_operand_from_path_wrapper(const G /* Traduit un opérande en version humainement lisible. */ static void py_arch_operand_print_wrapper(const GArchOperand *, GBufferLine *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Construit un petit résumé concis de l'opérande. */ static char *py_arch_operand_build_tooltip_wrapper(const GArchOperand *, const GLoadedBinary *); @@ -190,7 +190,7 @@ static void py_arch_operand_init_gclass(GArchOperandClass *class, gpointer unuse class->get_inner = py_arch_operand_get_inner_operand_from_path_wrapper; class->print = py_arch_operand_print_wrapper; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT class->build_tooltip = py_arch_operand_build_tooltip_wrapper; #endif @@ -462,7 +462,7 @@ static void py_arch_operand_print_wrapper(const GArchOperand *operand, GBufferLi } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -721,7 +721,7 @@ PyTypeObject *get_python_arch_operand_type(void) ARCH_OPERAND_FIND_INNER_OPERAND_PATH_WRAPPER, ARCH_OPERAND_GET_INNER_OPERAND_FROM_PATH_WRAPPER, ARCH_OPERAND_PRINT_WRAPPER, -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT ARCH_OPERAND_BUILD_TOOLTIP_WRAPPER, #endif ARCH_OPERAND_FIND_INNER_OPERAND_PATH_METHOD, diff --git a/plugins/pychrysalide/core.c b/plugins/pychrysalide/core.c index acd8ad6..771d129 100644 --- a/plugins/pychrysalide/core.c +++ b/plugins/pychrysalide/core.c @@ -40,7 +40,6 @@ #include <unistd.h> -#include <config.h> #include <i18n.h> #include <gleak.h> #include <common/cpp.h> @@ -611,7 +610,7 @@ PyMODINIT_FUNC PyInit_pychrysalide(void) if (status) status = add_debug_module(result); if (status) status = add_format_module(result); if (status) status = add_glibext_module(result); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT if (status) status = add_gtkext_module(result); if (status) status = add_gui_module(result); #endif @@ -628,7 +627,7 @@ PyMODINIT_FUNC PyInit_pychrysalide(void) if (status) status = populate_debug_module(); if (status) status = populate_format_module(); if (status) status = populate_glibext_module(); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT if (status) status = populate_gtkext_module(); if (status) status = populate_gui_module(); #endif diff --git a/plugins/pychrysalide/glibext/buffercache.c b/plugins/pychrysalide/glibext/buffercache.c index 6afaffc..03301d6 100644 --- a/plugins/pychrysalide/glibext/buffercache.c +++ b/plugins/pychrysalide/glibext/buffercache.c @@ -88,7 +88,7 @@ static PyObject *py_buffer_cache_get_line_flags(PyObject *, PyObject *); /* Retire une propriété particulière attachée à une ligne. */ static PyObject *py_buffer_cache_remove_line_flag(PyObject *, PyObject *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Retrouve une ligne au sein d'un tampon avec un indice. */ static PyObject *py_buffer_cache_find_line_by_index(PyObject *, PyObject *); @@ -829,7 +829,7 @@ static PyObject *py_buffer_cache_remove_line_flag(PyObject *self, PyObject *args } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -1167,7 +1167,7 @@ PyTypeObject *get_python_buffer_cache_type(void) BUFFER_CACHE_ADD_LINE_FLAG_METHOD, BUFFER_CACHE_GET_LINE_FLAGS_METHOD, BUFFER_CACHE_REMOVE_LINE_FLAG_METHOD, -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT BUFFER_CACHE_FIND_LINE_BY_INDEX_METHOD, #endif BUFFER_CACHE_LOOK_FOR_FLAG_METHOD, diff --git a/plugins/pychrysalide/glibext/constants.c b/plugins/pychrysalide/glibext/constants.c index 88e0fe9..169ffa2 100644 --- a/plugins/pychrysalide/glibext/constants.c +++ b/plugins/pychrysalide/glibext/constants.c @@ -31,7 +31,7 @@ #include <glibext/configuration.h> #include <glibext/linesegment.h> #include <glibext/gbinportion.h> -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include <glibext/gloadedpanel.h> #endif @@ -516,7 +516,7 @@ int convert_to_rendering_tag_type(PyObject *arg, void *dst) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/plugins/pychrysalide/glibext/constants.h b/plugins/pychrysalide/glibext/constants.h index 7fa9321..4a4f6da 100644 --- a/plugins/pychrysalide/glibext/constants.h +++ b/plugins/pychrysalide/glibext/constants.h @@ -58,7 +58,7 @@ bool define_line_segment_constants(PyTypeObject *); /* Tente de convertir en constante RenderingTagType. */ int convert_to_rendering_tag_type(PyObject *, void *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Définit les constantes relatives aux panneaux de chargement. */ bool define_loaded_panel_constants(PyTypeObject *); diff --git a/plugins/pychrysalide/glibext/module.c b/plugins/pychrysalide/glibext/module.c index 7fc2c0e..3e4307a 100644 --- a/plugins/pychrysalide/glibext/module.c +++ b/plugins/pychrysalide/glibext/module.c @@ -112,7 +112,7 @@ bool populate_glibext_module(void) if (result) result = ensure_python_binary_portion_is_registered(); if (result) result = ensure_python_buffer_cache_is_registered(); if (result) result = ensure_python_buffer_line_is_registered(); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT if (result) result = ensure_python_buffer_view_is_registered(); #endif if (result) result = ensure_python_comparable_item_is_registered(); @@ -121,7 +121,7 @@ bool populate_glibext_module(void) if (result) result = ensure_python_generic_config_is_registered(); if (result) result = ensure_python_line_cursor_is_registered(); if (result) result = ensure_python_line_generator_is_registered(); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT if (result) result = ensure_python_loaded_panel_is_registered(); if (result) result = ensure_python_named_widget_is_registered(); #endif diff --git a/plugins/pychrysalide/helpers.c b/plugins/pychrysalide/helpers.c index cee7296..c2b1868 100644 --- a/plugins/pychrysalide/helpers.c +++ b/plugins/pychrysalide/helpers.c @@ -32,7 +32,7 @@ #include <stdlib.h> #include <string.h> #include <strings.h> -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include <gtk/gtk.h> #endif @@ -1247,7 +1247,7 @@ int convert_to_gobject(PyObject *arg, void *dst) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/plugins/pychrysalide/helpers.h b/plugins/pychrysalide/helpers.h index 962de74..57cf96d 100644 --- a/plugins/pychrysalide/helpers.h +++ b/plugins/pychrysalide/helpers.h @@ -29,7 +29,7 @@ #include <assert.h> #include <glib-object.h> #include <stdbool.h> -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include <gdk/gdk.h> #endif @@ -242,7 +242,7 @@ int convert_to_gtype(PyObject *, void *); /* Tente de convertir en instance GObject. */ int convert_to_gobject(PyObject *, void *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Tente de convertir en instance de composant GTK. */ int convert_to_gtk_widget(PyObject *, void *); @@ -253,7 +253,7 @@ int convert_to_gtk_container(PyObject *, void *); #endif -#if !defined(HAVE_GTK_SUPPORT) && !defined(HOMEMADE_RGBA) +#if !defined(INCLUDE_GTK_SUPPORT) && !defined(HOMEMADE_RGBA) # define HOMEMADE_RGBA diff --git a/plugins/pychrysalide/plugins/plugin.c b/plugins/pychrysalide/plugins/plugin.c index e4eb2c6..2488d21 100644 --- a/plugins/pychrysalide/plugins/plugin.c +++ b/plugins/pychrysalide/plugins/plugin.c @@ -74,7 +74,7 @@ static PyObject *py_plugin_module_get_modname_by_default(PyObject *, PyObject *) /* Fournit le nom brut associé au greffon. */ static char *py_plugin_module_get_modname_wrapper(const GPluginModule *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Complète une liste de resources pour thème. */ static void py_plugin_module_include_theme_wrapper(const GPluginModule *, PluginAction, gboolean, char ***, size_t *); @@ -158,7 +158,7 @@ static void py_plugin_module_init_gclass(GPluginModuleClass *class, gpointer unu class->get_modname = py_plugin_module_get_modname_wrapper; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT class->include_theme = py_plugin_module_include_theme_wrapper; class->notify_panel = py_plugin_module_notify_panel_creation_wrapper; class->notify_docking = py_plugin_module_notify_panel_docking_wrapper; @@ -607,7 +607,7 @@ static char *py_plugin_module_get_modname_wrapper(const GPluginModule *plugin) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -1670,7 +1670,7 @@ PyTypeObject *get_python_plugin_module_type(void) PLUGIN_MODULE_MANAGE_WRAPPER, PLUGIN_MODULE_NOTIFY_PLUGINS_LOADED_WRAPPER, PLUGIN_MODULE_GET_MODNAME_WRAPPER, -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT PLUGIN_MODULE_INCLUDE_THEME_WRAPPER, PLUGIN_MODULE_ON_PANEL_CREATION_WRAPPER, PLUGIN_MODULE_ON_PANEL_DOCKING_WRAPPER, diff --git a/plugins/ropgadgets/plugin.c b/plugins/ropgadgets/plugin.c index 836717c..938a04c 100644 --- a/plugins/ropgadgets/plugin.c +++ b/plugins/ropgadgets/plugin.c @@ -24,7 +24,6 @@ #include "plugin.h" -#include <config.h> #include <i18n.h> @@ -36,7 +35,7 @@ #include "select.h" -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ diff --git a/plugins/winordinals/core.c b/plugins/winordinals/core.c index a16c400..bae2d6d 100644 --- a/plugins/winordinals/core.c +++ b/plugins/winordinals/core.c @@ -31,12 +31,12 @@ #include "assign.h" -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # include "python/module.h" #endif -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ @@ -67,7 +67,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) result = true; -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS if (result) result = add_winordinals_module_to_python_module(); diff --git a/plugins/yaml/core.c b/plugins/yaml/core.c index 7ac49e3..7dc0570 100644 --- a/plugins/yaml/core.c +++ b/plugins/yaml/core.c @@ -27,12 +27,12 @@ #include <plugins/self.h> -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # include "python/module.h" #endif -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS # define PG_REQ RL("PyChrysalide") #else # define PG_REQ NO_REQ @@ -63,7 +63,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) result = true; -#ifdef HAVE_PYTHON3_BINDINGS +#ifdef INCLUDE_PYTHON3_BINDINGS if (result) result = add_yaml_module_to_python_module(); diff --git a/src/analysis/binary.c b/src/analysis/binary.c index 0f0ff93..4309a4d 100644 --- a/src/analysis/binary.c +++ b/src/analysis/binary.c @@ -49,7 +49,7 @@ #include "../core/processors.h" #include "../format/known.h" #include "../glibext/gbinarycursor.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "../glibext/gloadedpanel.h" # include "../gtkext/easygtk.h" # include "../gtkext/gtkdisplaypanel.h" @@ -169,7 +169,7 @@ static void on_binary_processor_changed(GArchProcessor *, GArchInstruction *, gb /* Fournit le désignation associée à l'élément chargé. */ static char *g_loaded_binary_describe(const GLoadedBinary *, bool); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Détermine le nombre de vues disponibles pour un contenu. */ static unsigned int g_loaded_binary_count_views(const GLoadedBinary *); @@ -236,7 +236,7 @@ static void g_loaded_binary_class_init(GLoadedBinaryClass *klass) loaded->describe = (describe_loaded_fc)g_loaded_binary_describe; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT loaded->count_views = (count_loaded_views_fc)g_loaded_binary_count_views; loaded->get_view_name = (get_loaded_view_name_fc)g_loaded_binary_get_view_name; @@ -1475,7 +1475,7 @@ static bool g_loaded_binary_analyze(GLoadedBinary *binary, bool connect, bool ca char *desc; /* Description humaine associée*/ bool has_virt; /* Présence de virtuel ? */ GProcContext *context; /* Contexte de suivi dédié */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT GWidthTracker *tracker; /* Gestionnaire de largeur */ #endif @@ -1523,7 +1523,7 @@ static bool g_loaded_binary_analyze(GLoadedBinary *binary, bool connect, bool ca { output_disassembly(binary, context, status, &binary->disass_cache); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT tracker = g_buffer_cache_get_width_tracker(binary->disass_cache); @@ -1676,7 +1676,7 @@ static char *g_loaded_binary_describe(const GLoadedBinary *binary, bool full) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/analysis/block-int.h b/src/analysis/block-int.h index 869042c..80fa6ea 100644 --- a/src/analysis/block-int.h +++ b/src/analysis/block-int.h @@ -44,7 +44,7 @@ typedef int (* block_compare_links_fc) (const block_link_t *, const block_link_t /* Fournit les détails des origines d'un bloc de code donné. */ typedef block_link_t * (* block_get_links_fc) (const GCodeBlock *, const GBlockList *, size_t *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Fournit la représentation graphique d'un bloc de code. */ typedef GBufferView * (* block_build_view_fc) (const GCodeBlock *, segcnt_list *); @@ -68,7 +68,7 @@ struct _GCodeBlock size_t index; /* Indice dans une liste */ size_t rank; /* Rang dans l'exécution */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT GBufferView *view; /* Représentation construite */ #endif @@ -83,7 +83,7 @@ struct _GCodeBlockClass block_compare_links_fc cmp_links; /* Comparaison de liens */ block_get_links_fc get_src; /* Obtention des origines */ block_get_links_fc get_dest; /* Obtention des destinations */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT block_build_view_fc build; /* Construction d'une vue */ block_build_tooltip_fc build_tooltip; /* Construction d'une bulle */ #endif diff --git a/src/analysis/block.c b/src/analysis/block.c index a60d7ed..f93a772 100644 --- a/src/analysis/block.c +++ b/src/analysis/block.c @@ -139,7 +139,7 @@ static void g_code_block_init(GCodeBlock *block) block->index = (size_t)-1; block->rank = (size_t)-1; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT block->view = NULL; #endif @@ -160,7 +160,7 @@ static void g_code_block_init(GCodeBlock *block) static void g_code_block_dispose(GCodeBlock *block) { -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT g_clear_object(&block->view); #endif @@ -326,7 +326,7 @@ void g_code_block_set_rank(GCodeBlock *block, size_t rank) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/analysis/block.h b/src/analysis/block.h index 08cfeb4..401b520 100644 --- a/src/analysis/block.h +++ b/src/analysis/block.h @@ -33,7 +33,7 @@ #include "../arch/instruction.h" #include "../arch/vmpa.h" #include "../common/bits.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "../glibext/bufferview.h" #endif #include "../glibext/linesegment.h" @@ -76,7 +76,7 @@ size_t g_code_block_get_rank(const GCodeBlock *); /* Définit le rang du bloc de code dans le flot d'exécution. */ void g_code_block_set_rank(GCodeBlock *, size_t); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Fournit la représentation graphique d'un bloc de code. */ GBufferView *g_code_block_get_view(GCodeBlock *, segcnt_list *); diff --git a/src/analysis/db/cdb.c b/src/analysis/db/cdb.c index b1e47bc..1e8bfbb 100644 --- a/src/analysis/db/cdb.c +++ b/src/analysis/db/cdb.c @@ -39,7 +39,6 @@ #include <i18n.h> -#include <config.h> #include "backend-int.h" diff --git a/src/analysis/db/items/move.c b/src/analysis/db/items/move.c index d009456..e4f503b 100644 --- a/src/analysis/db/items/move.c +++ b/src/analysis/db/items/move.c @@ -35,11 +35,11 @@ #include "../collection-int.h" #include "../item-int.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "../../../gui/core/global.h" #endif #include "../../../glibext/gbinarycursor.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "../../../glibext/gloadedpanel.h" #endif @@ -414,7 +414,7 @@ static char *g_db_move_build_label(GDbMove *move) static bool g_db_move_run(const GDbMove *move, GLineCursor *cursor) { -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT GLoadedPanel *panel; /* Afficheur effectif de code */ diff --git a/src/analysis/disass/block.c b/src/analysis/disass/block.c index 973fd56..e15b4c1 100644 --- a/src/analysis/disass/block.c +++ b/src/analysis/disass/block.c @@ -88,7 +88,7 @@ static block_link_t *g_basic_block_get_sources(const GBasicBlock *, const GBlock /* Fournit les détails des destinations de bloc de code. */ static block_link_t *g_basic_block_get_destinations(const GBasicBlock *, const GBlockList *, size_t *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Fournit la représentation graphique d'un bloc de code. */ static GBufferView *g_basic_block_build_view(const GBasicBlock *, segcnt_list *); @@ -137,7 +137,7 @@ static void g_basic_block_class_init(GBasicBlockClass *class) block->cmp_links = (block_compare_links_fc)g_basic_block_compare_links; block->get_src = (block_get_links_fc)g_basic_block_get_sources; block->get_dest = (block_get_links_fc)g_basic_block_get_destinations; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT block->build = (block_build_view_fc)g_basic_block_build_view; block->build_tooltip = (block_build_tooltip_fc)g_basic_block_build_tooltip; #endif @@ -472,7 +472,7 @@ static block_link_t *g_basic_block_get_destinations(const GBasicBlock *block, co } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/analysis/disass/disassembler.c b/src/analysis/disass/disassembler.c index 7ea127d..4baa810 100644 --- a/src/analysis/disass/disassembler.c +++ b/src/analysis/disass/disassembler.c @@ -391,7 +391,7 @@ void output_disassembly(GLoadedBinary *binary, GProcContext *context, GtkStatusS GBinContent *content; /* Contenu bianire manipulé */ GCodingLanguage *lang; /* Langage de sortie préféré */ int offset; /* Décalage des étiquettes */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT GWidthTracker *tracker; /* Gestionnaire de largeurs */ #endif char **text; /* Contenu brute à imprimer */ @@ -411,7 +411,7 @@ void output_disassembly(GLoadedBinary *binary, GProcContext *context, GtkStatusS g_generic_config_get_value(get_main_configuration(), MPK_LABEL_OFFSET, &offset); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT tracker = g_buffer_cache_get_width_tracker(*cache); g_width_tracker_set_column_min_width(tracker, DLC_ASSEMBLY_LABEL, offset); g_object_unref(G_OBJECT(tracker)); diff --git a/src/analysis/loaded-int.h b/src/analysis/loaded-int.h index f91e85d..245b5ef 100644 --- a/src/analysis/loaded-int.h +++ b/src/analysis/loaded-int.h @@ -48,7 +48,7 @@ typedef bool (* analyze_loaded_fc) (GLoadedContent *, bool, bool, wgroup_id_t, G /* Fournit le désignation associée à l'élément chargé. */ typedef char * (* describe_loaded_fc) (const GLoadedContent *, bool); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Détermine le nombre de vues disponibles pour un contenu. */ typedef unsigned int (* count_loaded_views_fc) (const GLoadedContent *); @@ -95,7 +95,7 @@ struct _GLoadedContentClass describe_loaded_fc describe; /* Description de contenu */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT count_loaded_views_fc count_views; /* Compteur de vues */ get_loaded_view_name_fc get_view_name; /* Désignation d'une vue donnée*/ diff --git a/src/analysis/loaded.c b/src/analysis/loaded.c index 02caeff..9a7b1fd 100644 --- a/src/analysis/loaded.c +++ b/src/analysis/loaded.c @@ -32,7 +32,7 @@ #include "../core/global.h" #include "../core/queue.h" #include "../glibext/chrysamarshal.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "../glibext/gloadedpanel.h" # include "../glibext/named-int.h" #endif @@ -62,7 +62,7 @@ static void g_loaded_content_class_init(GLoadedContentClass *); /* Initialise un contenu chargé. */ static void g_loaded_content_init(GLoadedContent *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Procède à l'initialisation de l'interface de composant nommé. */ static void g_loaded_content_named_init(GNamedWidgetIface *); @@ -95,7 +95,7 @@ static void on_loaded_content_analysis_completed(GSeqWork *, analysis_data_t *); /* Détermine le type d'une interface pour l'intégration de contenu chargé. */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT G_DEFINE_TYPE_WITH_CODE(GLoadedContent, g_loaded_content, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE(G_TYPE_NAMED_WIDGET, g_loaded_content_named_init)); #else @@ -153,7 +153,7 @@ static void g_loaded_content_init(GLoadedContent *content) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -593,7 +593,7 @@ char **g_loaded_content_detect_obfuscators(const GLoadedContent *content, bool v /* ---------------------------------------------------------------------------------- */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -773,7 +773,7 @@ GDisplayOptions *g_loaded_content_get_display_options(const GLoadedContent *cont /* ---------------------------------------------------------------------------------- */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/analysis/loaded.h b/src/analysis/loaded.h index 040dacb..0f627b1 100644 --- a/src/analysis/loaded.h +++ b/src/analysis/loaded.h @@ -27,7 +27,7 @@ #include <glib-object.h> #include <stdbool.h> -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include <gtk/gtk.h> #endif @@ -35,7 +35,7 @@ #include "content.h" #include "../common/xml.h" #include "../glibext/gdisplayoptions.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "../gtkext/gtkdockstation.h" #endif @@ -91,7 +91,7 @@ char **g_loaded_content_detect_obfuscators(const GLoadedContent *, bool, size_t /* --------------------------- GESTION DYNAMIQUE DES VUES --------------------------- */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Détermine le nombre de vues disponibles pour un contenu. */ unsigned int g_loaded_content_count_views(const GLoadedContent *); @@ -118,7 +118,7 @@ GDisplayOptions *g_loaded_content_get_display_options(const GLoadedContent *, un /* ----------------------- VUES ET BASCULEMENT ENTRE LES VUES ----------------------- */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Fournit la station d'accueil d'un panneau d'affichage. */ GtkDockStation *get_dock_station_for_view_panel(GtkWidget *); diff --git a/src/analysis/project.c b/src/analysis/project.c index c966195..9a5e4e2 100644 --- a/src/analysis/project.c +++ b/src/analysis/project.c @@ -1365,7 +1365,7 @@ static void on_new_content_resolved(GContentResolver *resolver, wgroup_id_t wid, /* ---------------------------------------------------------------------------------- */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/analysis/project.h b/src/analysis/project.h index c058444..a5b1a73 100644 --- a/src/analysis/project.h +++ b/src/analysis/project.h @@ -25,7 +25,7 @@ #define _ANALYSIS_PROJECT_H -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include <gtk/gtk.h> #endif @@ -117,7 +117,7 @@ GLoadedContent **g_study_project_get_contents(GStudyProject *, size_t *); /* ------------------------- GESTION GLOBALISEE DES PROJETS ------------------------- */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Fournit le gestionnaire des projets connus. */ GtkRecentManager *get_project_manager(void); diff --git a/src/analysis/routine.c b/src/analysis/routine.c index de066dc..2cb4ad3 100644 --- a/src/analysis/routine.c +++ b/src/analysis/routine.c @@ -1047,7 +1047,7 @@ void g_binary_routine_print_code(const GBinRoutine *routine, GLangOutput *lang, -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/analysis/routine.h b/src/analysis/routine.h index 2e5e22d..ac33fbd 100644 --- a/src/analysis/routine.h +++ b/src/analysis/routine.h @@ -133,7 +133,7 @@ char *g_binary_routine_to_string(const GBinRoutine *, bool); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Construit un petit résumé concis de la routine. */ char *g_binary_routine_build_tooltip(const GBinRoutine *, const GLoadedBinary *); diff --git a/src/analysis/scan/core.c b/src/analysis/scan/core.c index d102d58..3d4e529 100644 --- a/src/analysis/scan/core.c +++ b/src/analysis/scan/core.c @@ -24,7 +24,6 @@ #include "core.h" -#include <config.h> #include <malloc.h> #include <string.h> @@ -33,7 +32,7 @@ #include "items/datasize.h" #include "items/uint.h" #include "items/console/log.h" -#ifdef HAVE_MAGIC_SUPPORT +#ifdef INCLUDE_MAGIC_SUPPORT # include "items/magic/type.h" # include "items/magic/mime-encoding.h" # include "items/magic/mime-type.h" @@ -266,7 +265,7 @@ bool populate_main_scan_namespace(GScanNamespace *space) /* Magic */ -#ifdef HAVE_MAGIC_SUPPORT +#ifdef INCLUDE_MAGIC_SUPPORT if (result) { ns = g_scan_namespace_new("magic"); diff --git a/src/arch/instruction.c b/src/arch/instruction.c index 7fb9c4a..cd1e9c7 100644 --- a/src/arch/instruction.c +++ b/src/arch/instruction.c @@ -81,7 +81,7 @@ bool g_arch_instruction_store_destinations(GArchInstruction *, GObjectStorage *, /* Indique le nombre de ligne prêtes à être générées. */ static size_t g_arch_instruction_count_lines(const GArchInstruction *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Retrouve l'emplacement correspondant à une position donnée. */ static void g_arch_instruction_compute_cursor(const GArchInstruction *, gint, size_t, size_t, GLineCursor **); @@ -199,7 +199,7 @@ static void g_arch_instruction_init(GArchInstruction *instr) static void g_arch_instruction_generator_init(GLineGeneratorInterface *iface) { iface->count = (linegen_count_lines_fc)g_arch_instruction_count_lines; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT iface->compute = (linegen_compute_fc)g_arch_instruction_compute_cursor; iface->contain = (linegen_contain_fc)g_arch_instruction_contain_cursor; #endif @@ -1841,7 +1841,7 @@ static size_t g_arch_instruction_count_lines(const GArchInstruction *instr) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/arch/operand-int.h b/src/arch/operand-int.h index 3973287..e6c1232 100644 --- a/src/arch/operand-int.h +++ b/src/arch/operand-int.h @@ -48,7 +48,7 @@ typedef GArchOperand * (* get_inner_operand_fc) (const GArchOperand *, const cha /* Traduit un opérande en version humainement lisible. */ typedef void (* operand_print_fc) (const GArchOperand *, GBufferLine *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Construit un petit résumé concis de l'opérande. */ typedef char * (* operand_build_tooltip_fc) (const GArchOperand *, const GLoadedBinary *); @@ -117,7 +117,7 @@ struct _GArchOperandClass get_inner_operand_fc get_inner; /* Récupération d'un opérande */ operand_print_fc print; /* Texte humain équivalent */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT operand_build_tooltip_fc build_tooltip; /* Construction de description */ #endif diff --git a/src/arch/operand.c b/src/arch/operand.c index ab7eeab..0f5ffd5 100644 --- a/src/arch/operand.c +++ b/src/arch/operand.c @@ -408,7 +408,7 @@ void g_arch_operand_print(const GArchOperand *operand, GBufferLine *line) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/arch/operand.h b/src/arch/operand.h index 62d2969..234ee64 100644 --- a/src/arch/operand.h +++ b/src/arch/operand.h @@ -88,7 +88,7 @@ GArchOperand *g_arch_operand_get_inner_operand_from_path(const GArchOperand *, c /* Traduit un opérande en version humainement lisible. */ void g_arch_operand_print(const GArchOperand *, GBufferLine *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Construit un petit résumé concis de l'opérande. */ char *g_arch_operand_build_tooltip(const GArchOperand *, const GLoadedBinary *); diff --git a/src/arch/operands/immediate.c b/src/arch/operands/immediate.c index 9cb60a1..f40c645 100644 --- a/src/arch/operands/immediate.c +++ b/src/arch/operands/immediate.c @@ -82,7 +82,7 @@ static void g_imm_operand_print(const GImmOperand *, GBufferLine *); /* Compare un opérande avec un autre. */ static int g_imm_operand_compare(const GImmOperand *, const GImmOperand *, bool); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Construit un petit résumé concis de l'opérande. */ static char *g_imm_operand_build_tooltip(const GImmOperand *, const GLoadedBinary *); @@ -152,7 +152,7 @@ static void g_imm_operand_class_init(GImmOperandClass *klass) operand->compare = (operand_compare_fc)g_imm_operand_compare; operand->print = (operand_print_fc)g_imm_operand_print; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT operand->build_tooltip = (operand_build_tooltip_fc)g_imm_operand_build_tooltip; #endif @@ -1232,7 +1232,7 @@ static int g_imm_operand_compare(const GImmOperand *a, const GImmOperand *b, boo } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/arch/operands/target.c b/src/arch/operands/target.c index e33e1ee..61f683a 100644 --- a/src/arch/operands/target.c +++ b/src/arch/operands/target.c @@ -74,7 +74,7 @@ static int g_target_operand_compare(const GTargetOperand *, const GTargetOperand /* Traduit un opérande en version humainement lisible. */ static void g_target_operand_print(const GTargetOperand *, GBufferLine *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Construit un petit résumé concis de l'opérande. */ static char *g_target_operand_build_tooltip(const GTargetOperand *, const GLoadedBinary *); @@ -136,7 +136,7 @@ static void g_target_operand_class_init(GTargetOperandClass *klass) operand->compare = (operand_compare_fc)g_target_operand_compare; operand->print = (operand_print_fc)g_target_operand_print; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT operand->build_tooltip = (operand_build_tooltip_fc)g_target_operand_build_tooltip; #endif @@ -388,7 +388,7 @@ GArchOperand *g_target_operand_new(MemoryDataSize size, const vmpa2t *addr) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/core/core.c b/src/core/core.c index 626d58b..fe7a5e0 100644 --- a/src/core/core.c +++ b/src/core/core.c @@ -31,9 +31,6 @@ #include <openssl/ssl.h> -#include <config.h> - - #include "collections.h" #include "demanglers.h" #include "global.h" @@ -41,7 +38,7 @@ #include "processors.h" #include "queue.h" #include "../analysis/scan/core.h" -#ifdef HAVE_MAGIC_SUPPORT +#ifdef INCLUDE_MAGIC_SUPPORT # include "../analysis/scan/items/magic/cookie.h" #endif #include "../common/io.h" @@ -108,7 +105,7 @@ bool load_all_core_components(bool cs) resolver = g_content_resolver_new(); set_current_content_resolver(resolver); -#ifdef HAVE_MAGIC_SUPPORT +#ifdef INCLUDE_MAGIC_SUPPORT if (result) result = init_magic_cookie(); #endif @@ -161,7 +158,7 @@ void unload_all_core_components(bool cs) unload_all_scan_token_modifiers(); set_rost_root_namespace(NULL); -#ifdef HAVE_MAGIC_SUPPORT +#ifdef INCLUDE_MAGIC_SUPPORT exit_magic_cookie(); #endif diff --git a/src/core/logs.c b/src/core/logs.c index 9385020..2b2b1ab 100644 --- a/src/core/logs.c +++ b/src/core/logs.c @@ -29,7 +29,7 @@ #include "../common/extstr.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "../gui/core/items.h" # include "../gui/panels/log.h" #endif @@ -109,13 +109,13 @@ void set_log_verbosity(LogMessageType level) void log_simple_message(LogMessageType type, const char *msg) { -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT GEditorItem *item; /* Eventuel affichage présent */ #endif if (type >= _verbosity) { -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT item = find_editor_item_by_type(G_TYPE_LOG_PANEL); diff --git a/src/format/symbol.c b/src/format/symbol.c index 934eee3..5684928 100644 --- a/src/format/symbol.c +++ b/src/format/symbol.c @@ -32,7 +32,7 @@ #include "symbol-int.h" #include "../analysis/db/misc/rlestr.h" #include "../core/columns.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "../glibext/gbinarycursor.h" #endif #include "../glibext/linegen-int.h" @@ -68,7 +68,7 @@ static void g_binary_symbol_finalize(GBinSymbol *); /* Indique le nombre de ligne prêtes à être générées. */ static size_t g_binary_symbol_count_lines(const GBinSymbol *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Retrouve l'emplacement correspondant à une position donnée. */ static void g_binary_symbol_compute_cursor(const GBinSymbol *, gint, size_t, size_t, GLineCursor **); @@ -183,7 +183,7 @@ static void g_binary_symbol_init(GBinSymbol *symbol) static void g_binary_symbol_interface_init(GLineGeneratorInterface *iface) { iface->count = (linegen_count_lines_fc)g_binary_symbol_count_lines; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT iface->compute = (linegen_compute_fc)g_binary_symbol_compute_cursor; iface->contain = (linegen_contain_fc)g_binary_symbol_contain_cursor; #endif @@ -792,7 +792,7 @@ static size_t g_binary_symbol_count_lines(const GBinSymbol *symbol) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/glibext/buffercache-int.h b/src/glibext/buffercache-int.h index 4991bd0..0e831a2 100644 --- a/src/glibext/buffercache-int.h +++ b/src/glibext/buffercache-int.h @@ -68,7 +68,7 @@ struct _GBufferCache GBinContent *content; /* Contenu binaire global */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT GWidthTracker *tracker; /* Suivi des largeurs */ #endif diff --git a/src/glibext/buffercache.c b/src/glibext/buffercache.c index ed1068c..78c7479 100644 --- a/src/glibext/buffercache.c +++ b/src/glibext/buffercache.c @@ -59,7 +59,7 @@ static void get_cache_info_cursor(const cache_info *, size_t, gint, GLineCursor /* Suivit les variations du compteur de références d'une ligne. */ static void on_line_ref_toggle(cache_info *, GBufferLine *, gboolean); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Fournit la ligne de tampon correspondant aux générateurs. */ static GBufferLine *get_cache_info_line(cache_info *, const GWidthTracker *, size_t, const GBinContent *); @@ -371,7 +371,7 @@ static void on_line_ref_toggle(cache_info *info, GBufferLine *line, gboolean las } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -557,7 +557,7 @@ static void g_buffer_cache_init(GBufferCache *cache) cache->used = 0; g_rw_lock_init(&cache->access); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT cache->tracker = NULL; #endif @@ -599,7 +599,7 @@ static void g_buffer_cache_dispose(GBufferCache *cache) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT g_clear_object(&cache->tracker); #endif @@ -670,7 +670,7 @@ GBufferCache *g_buffer_cache_new(GBinContent *content, size_t col_count, size_t g_object_ref(G_OBJECT(content)); } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT result->tracker = g_width_tracker_new(result, col_count, opt_count); #endif @@ -774,7 +774,7 @@ gint g_buffer_cache_get_text_position(const GBufferCache *cache) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -927,7 +927,7 @@ static size_t g_buffer_cache_compute_repetition(GBufferCache *cache, size_t inde void g_buffer_cache_insert_at(GBufferCache *cache, size_t index, GLineGenerator *generator, BufferLineFlags flags, bool before, bool after) { -#if !defined(NDEBUG) && defined(HAVE_GTK_SUPPORT) +#if !defined(NDEBUG) && defined(INCLUDE_GTK_SUPPORT) GLineCursor *gen_cursor; /* Position du générateur */ GLineCursor *line_cursor; /* Position de la ligne */ int ret; /* Bilan de comparaison */ @@ -941,7 +941,7 @@ void g_buffer_cache_insert_at(GBufferCache *cache, size_t index, GLineGenerator assert(!(before && after)); -#if !defined(NDEBUG) && defined(HAVE_GTK_SUPPORT) +#if !defined(NDEBUG) && defined(INCLUDE_GTK_SUPPORT) if (!before && !after) { @@ -1003,7 +1003,7 @@ void g_buffer_cache_insert_at(GBufferCache *cache, size_t index, GLineGenerator cache->used += needed; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT g_width_tracker_update_added(cache->tracker, index, needed); #endif @@ -1015,7 +1015,7 @@ void g_buffer_cache_insert_at(GBufferCache *cache, size_t index, GLineGenerator { extend_cache_info(&cache->lines[index], generator, flags); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT g_width_tracker_update(cache->tracker, index); #endif @@ -1031,7 +1031,7 @@ void g_buffer_cache_insert_at(GBufferCache *cache, size_t index, GLineGenerator cache->used += needed - 1; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT g_width_tracker_update_added(cache->tracker, index + 1, needed - 1); #endif @@ -1079,7 +1079,7 @@ void g_buffer_cache_delete_at(GBufferCache *cache, size_t index) cache->used--; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT g_width_tracker_update_deleted(cache->tracker, index, index); #endif @@ -1200,7 +1200,7 @@ GLineGenerator *g_buffer_cache_delete_type_at(GBufferCache *cache, size_t index, cache->used--; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT g_width_tracker_update_deleted(cache->tracker, delete, delete); #endif @@ -1267,7 +1267,7 @@ void g_buffer_cache_append(GBufferCache *cache, GLineGenerator *generator, Buffe cache->used += count; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT g_width_tracker_update_added(cache->tracker, index, count); #endif @@ -1326,7 +1326,7 @@ void g_buffer_cache_extend_with(GBufferCache *cache, size_t count, GLineGenerato if (added > 0) { -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT g_width_tracker_update_added(cache->tracker, index, added); #endif @@ -1385,7 +1385,7 @@ void g_buffer_cache_truncate(GBufferCache *cache, size_t max) cache->used = max; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT g_width_tracker_update_deleted(cache->tracker, max, max + removed - 1); #endif @@ -1396,7 +1396,7 @@ void g_buffer_cache_truncate(GBufferCache *cache, size_t max) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -1636,7 +1636,7 @@ void g_buffer_cache_refresh_line(GBufferCache *cache, size_t index) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -1872,7 +1872,7 @@ size_t g_buffer_cache_find_index_by_cursor(GBufferCache *cache, const GLineCurso } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/glibext/buffercache.h b/src/glibext/buffercache.h index ec23b59..68941c5 100644 --- a/src/glibext/buffercache.h +++ b/src/glibext/buffercache.h @@ -27,14 +27,14 @@ #include <glib-object.h> #include <stdbool.h> -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include <gdk/gdk.h> #endif #include "gdisplayoptions.h" #include "linegen.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "widthtracker.h" #endif @@ -76,7 +76,7 @@ gint g_buffer_cache_get_left_margin(const GBufferCache *); /* Fournit la position de départ pour l'impression de texte. */ gint g_buffer_cache_get_text_position(const GBufferCache *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Fournit un lien vers la structure de suivi de largeurs. */ GWidthTracker *g_buffer_cache_get_width_tracker(const GBufferCache *); @@ -115,7 +115,7 @@ void g_buffer_cache_extend_with(GBufferCache *, size_t, GLineGenerator *); /* Réduit le tampon à une quantité de lignes précise. */ void g_buffer_cache_truncate(GBufferCache *, size_t); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Retrouve l'emplacement correspondant à une position de ligne. */ void g_buffer_cache_get_line_cursor(GBufferCache *, size_t, gint, GLineCursor **); @@ -137,7 +137,7 @@ size_t g_buffer_cache_look_for_flag(GBufferCache *, size_t, BufferLineFlags); /* Force la mise à jour du contenu d'une ligne donnée. */ void g_buffer_cache_refresh_line(GBufferCache *, size_t); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Retrouve une ligne au sein d'un tampon avec un indice. */ GBufferLine *g_buffer_cache_find_line_by_index(GBufferCache *, size_t); @@ -156,7 +156,7 @@ size_t _g_buffer_cache_find_index_by_cursor(GBufferCache *, const GLineCursor *, /* Indique l'indice correspondant à une adresse donnée. */ size_t g_buffer_cache_find_index_by_cursor(GBufferCache *, const GLineCursor *, bool); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Indique la position d'affichage d'une adresse donnée. */ bool g_buffer_cache_get_cursor_coordinates(GBufferCache *, const GLineCursor *, size_t, size_t, bool, gint *, gint *); diff --git a/src/glibext/bufferline.c b/src/glibext/bufferline.c index 3fc08a4..2bdfebc 100644 --- a/src/glibext/bufferline.c +++ b/src/glibext/bufferline.c @@ -69,7 +69,7 @@ struct _GBufferLineClass { GObjectClass parent; /* A laisser en premier */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT cairo_surface_t *entrypoint_img; /* Image pour les entrées */ cairo_surface_t *bookmark_img; /* Image pour les signets */ #endif @@ -122,7 +122,7 @@ G_DEFINE_TYPE(GBufferLine, g_buffer_line, G_TYPE_OBJECT); static void g_buffer_line_class_init(GBufferLineClass *class) { GObjectClass *object; /* Autre version de la classe */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT gchar *filename; /* Chemin d'accès à utiliser */ #endif @@ -131,7 +131,7 @@ static void g_buffer_line_class_init(GBufferLineClass *class) object->dispose = (GObjectFinalizeFunc/* ! */)g_buffer_line_dispose; object->finalize = (GObjectFinalizeFunc)g_buffer_line_finalize; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT filename = find_pixmap_file("entrypoint.png"); assert(filename != NULL); @@ -892,7 +892,7 @@ void g_buffer_line_export(GBufferLine *line, buffer_export_context *ctx, BufferE /* ---------------------------------------------------------------------------------- */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/glibext/bufferline.h b/src/glibext/bufferline.h index 1690d15..f5f25d0 100644 --- a/src/glibext/bufferline.h +++ b/src/glibext/bufferline.h @@ -31,7 +31,7 @@ #include "gdisplayoptions.h" #include "linesegment.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "widthtracker.h" #endif #include "../analysis/content.h" @@ -141,7 +141,7 @@ typedef struct _col_coord_t } col_coord_t; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Fait remonter les largeurs requises par une ligne donnée. */ void g_buffer_line_collect_widths(const GBufferLine *, size_t, size_t, gint *, gint *); diff --git a/src/glibext/configuration.h b/src/glibext/configuration.h index b5dcc3c..05dbc65 100644 --- a/src/glibext/configuration.h +++ b/src/glibext/configuration.h @@ -27,12 +27,12 @@ #include <glib-object.h> #include <stdbool.h> -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include <gdk/gdk.h> #endif -#if !defined(HAVE_GTK_SUPPORT) && !defined(HOMEMADE_RGBA) +#if !defined(INCLUDE_GTK_SUPPORT) && !defined(HOMEMADE_RGBA) # define HOMEMADE_RGBA diff --git a/src/glibext/delayed.c b/src/glibext/delayed.c index 321144b..64f18cf 100644 --- a/src/glibext/delayed.c +++ b/src/glibext/delayed.c @@ -33,7 +33,7 @@ #include "delayed-int.h" #include "../core/nproc.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "../gui/core/global.h" #endif @@ -614,7 +614,7 @@ static void *g_work_group_process(GWorkGroup *group) g_mutex_unlock(&group->mutex); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT status = get_global_status(); #else status = NULL; diff --git a/src/glibext/gbinportion-int.h b/src/glibext/gbinportion-int.h index 1e6ade3..a29f53c 100644 --- a/src/glibext/gbinportion-int.h +++ b/src/glibext/gbinportion-int.h @@ -36,7 +36,7 @@ struct _GBinPortion char *code; /* Code de la couleur de fond */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT cairo_surface_t *icon; /* Image de représentation */ #endif diff --git a/src/glibext/gbinportion.c b/src/glibext/gbinportion.c index 4f16e9f..12e12fb 100644 --- a/src/glibext/gbinportion.c +++ b/src/glibext/gbinportion.c @@ -62,7 +62,7 @@ static void g_binary_portion_dispose(GBinPortion *); /* Procède à la libération totale de la mémoire. */ static void g_binary_portion_finalize(GBinPortion *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Détermine l'aire d'une sous-portion. */ static bool g_binary_portion_compute_sub_area(const GBinPortion *, phys_t, const GdkRectangle *, GdkRectangle *); @@ -77,7 +77,7 @@ static bool g_binary_portion_compute_sub_area(const GBinPortion *, phys_t, const /* Indique le nombre de ligne prêtes à être générées. */ static size_t g_binary_portion_count_lines(const GBinPortion *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Retrouve l'emplacement correspondant à une position donnée. */ static void g_binary_portion_compute_cursor(const GBinPortion *, gint, size_t, size_t, GLineCursor **); @@ -101,7 +101,7 @@ static void g_binary_portion_print(GBinPortion *, GBufferLine *, size_t, size_t, /* Détermine si une portion contient une adresse donnée. */ static bool g_binary_portion_contains_vmpa(const GBinPortion *, const vmpa2t *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Recherche la portion présente à une adresse donnée. */ static GBinPortion *g_binary_portion_find_with_area_at_addr(GBinPortion *, const vmpa2t *, GdkRectangle *); @@ -169,7 +169,7 @@ static void g_binary_portion_init(GBinPortion *portion) portion->code = NULL; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT portion->icon = NULL; #endif @@ -200,7 +200,7 @@ static void g_binary_portion_init(GBinPortion *portion) static void g_binary_portion_interface_init(GLineGeneratorInterface *iface) { iface->count = (linegen_count_lines_fc)g_binary_portion_count_lines; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT iface->compute = (linegen_compute_fc)g_binary_portion_compute_cursor; iface->contain = (linegen_contain_fc)g_binary_portion_contain_cursor; #endif @@ -253,7 +253,7 @@ static void g_binary_portion_finalize(GBinPortion *portion) if (portion->code != NULL) free(portion->code); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT if (portion->icon != NULL) cairo_surface_destroy(portion->icon); #endif @@ -333,7 +333,7 @@ int g_binary_portion_compare(const GBinPortion **a, const GBinPortion **b) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -617,7 +617,7 @@ PortionAccessRights g_binary_portion_get_rights(const GBinPortion *portion) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -701,7 +701,7 @@ void g_binary_portion_query_tooltip(GBinPortion *portion, GtkTooltip *tooltip) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -1066,7 +1066,7 @@ static size_t g_binary_portion_count_lines(const GBinPortion *portion) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -1190,7 +1190,7 @@ static void g_binary_portion_print(GBinPortion *portion, GBufferLine *line, size /* ---------------------------------------------------------------------------------- */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -1371,7 +1371,7 @@ GBinPortion *g_binary_portion_find_at_addr(GBinPortion *portion, const vmpa2t *a } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/glibext/gbinportion.h b/src/glibext/gbinportion.h index 7bc1ee6..ea4b4aa 100644 --- a/src/glibext/gbinportion.h +++ b/src/glibext/gbinportion.h @@ -27,7 +27,7 @@ #include <glib-object.h> #include <stdbool.h> -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include <gtk/gtk.h> #endif @@ -89,7 +89,7 @@ GBinPortion *g_binary_portion_new(const char *, const vmpa2t *, phys_t); /* Etablit la comparaison ascendante entre deux portions. */ int g_binary_portion_compare(const GBinPortion **, const GBinPortion **); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Attribue à la portion une éventuelle image de représentation. */ void g_binary_portion_set_icon(GBinPortion *, cairo_surface_t *); @@ -123,7 +123,7 @@ void g_binary_portion_set_rights(GBinPortion *, PortionAccessRights); /* Fournit les droits associés à une partie de code. */ PortionAccessRights g_binary_portion_get_rights(const GBinPortion *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Prépare une astuce concernant une portion pour son affichage. */ void g_binary_portion_query_tooltip(GBinPortion *, GtkTooltip *); @@ -157,7 +157,7 @@ bool g_binary_portion_visit(GBinPortion *, visit_portion_fc, void *); /* ------------------------ PARCOURS D'ENSEMBLES DE PORTIONS ------------------------ */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Compte le nombre de portions présentes dans une arborescence. */ size_t g_binary_portion_count(const GBinPortion *); @@ -170,7 +170,7 @@ GBinPortion *g_binary_portion_find_at_pos(GBinPortion *, gint, GdkRectangle *); /* Recherche la portion présente à une adresse donnée. */ GBinPortion *g_binary_portion_find_at_addr(GBinPortion *, const vmpa2t *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Fournit la position correspondant à une adresse donnée. */ bool get_binary_portion_addr_from_pos(GBinPortion *, gint, const GdkRectangle *, vmpa2t *); diff --git a/src/glibext/generators/hex.c b/src/glibext/generators/hex.c index b182176..d9e5251 100644 --- a/src/glibext/generators/hex.c +++ b/src/glibext/generators/hex.c @@ -90,7 +90,7 @@ static void g_hex_generator_finalize(GHexGenerator *); /* Indique le nombre de ligne prêtes à être générées. */ static size_t g_hex_generator_count_lines(const GHexGenerator *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Retrouve l'emplacement correspondant à une position donnée. */ static void g_hex_generator_compute_cursor(const GHexGenerator *, gint, size_t, size_t, GLineCursor **); @@ -203,7 +203,7 @@ static void g_hex_generator_init(GHexGenerator *generator) static void g_hex_generator_interface_init(GLineGeneratorInterface *iface) { iface->count = (linegen_count_lines_fc)g_hex_generator_count_lines; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT iface->compute = (linegen_compute_fc)g_hex_generator_compute_cursor; iface->contain = (linegen_contain_fc)g_hex_generator_contain_cursor; #endif @@ -316,7 +316,7 @@ static size_t g_hex_generator_count_lines(const GHexGenerator *generator) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/glibext/generators/prologue.c b/src/glibext/generators/prologue.c index 944de8e..6b3260d 100644 --- a/src/glibext/generators/prologue.c +++ b/src/glibext/generators/prologue.c @@ -29,7 +29,7 @@ #include "../bufferline.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "../gbinarycursor.h" #endif #include "../linegen-int.h" @@ -85,7 +85,7 @@ static void g_intro_generator_finalize(GIntroGenerator *); /* Indique le nombre de ligne prêtes à être générées. */ static size_t g_intro_generator_count_lines(const GIntroGenerator *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Retrouve l'emplacement correspondant à une position donnée. */ static void g_intro_generator_compute_cursor(const GIntroGenerator *, gint, size_t, size_t, GLineCursor **); @@ -172,7 +172,7 @@ static void g_intro_generator_init(GIntroGenerator *generator) static void g_intro_generator_interface_init(GLineGeneratorInterface *iface) { iface->count = (linegen_count_lines_fc)g_intro_generator_count_lines; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT iface->compute = (linegen_compute_fc)g_intro_generator_compute_cursor; iface->contain = (linegen_contain_fc)g_intro_generator_contain_cursor; #endif @@ -309,7 +309,7 @@ static size_t g_intro_generator_count_lines(const GIntroGenerator *generator) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/glibext/generators/rborder.c b/src/glibext/generators/rborder.c index b4db5d3..8379c7a 100644 --- a/src/glibext/generators/rborder.c +++ b/src/glibext/generators/rborder.c @@ -30,7 +30,7 @@ #include "../bufferline.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "../gbinarycursor.h" #endif #include "../linegen-int.h" @@ -92,7 +92,7 @@ static void g_border_generator_finalize(GBorderGenerator *); /* Indique le nombre de ligne prêtes à être générées. */ static size_t g_border_generator_count_lines(const GBorderGenerator *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Retrouve l'emplacement correspondant à une position donnée. */ static void g_border_generator_compute_cursor(const GBorderGenerator *, gint, size_t, size_t, GLineCursor **); @@ -177,7 +177,7 @@ static void g_border_generator_init(GBorderGenerator *generator) static void g_border_generator_interface_init(GLineGeneratorInterface *iface) { iface->count = (linegen_count_lines_fc)g_border_generator_count_lines; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT iface->compute = (linegen_compute_fc)g_border_generator_compute_cursor; iface->contain = (linegen_contain_fc)g_border_generator_contain_cursor; #endif @@ -286,7 +286,7 @@ static size_t g_border_generator_count_lines(const GBorderGenerator *generator) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/glibext/linecolumn.c b/src/glibext/linecolumn.c index 03fa179..35f7698 100644 --- a/src/glibext/linecolumn.c +++ b/src/glibext/linecolumn.c @@ -49,7 +49,7 @@ void init_line_column(line_column *column) column->segments = NULL; column->count = 0; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT column->max_width = 0; #endif @@ -83,14 +83,14 @@ void reset_line_column(line_column *column) column->count = 0; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT column->max_width = 0; #endif } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -167,7 +167,7 @@ size_t append_text_to_line_column(line_column *column, const char *text, size_t column->segments[result] = segment; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT column->max_width += get_line_segment_width(segment); #endif @@ -212,14 +212,14 @@ void replace_text_in_line_column(line_column *column, size_t index, const char * column->segments[index] = segment; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT refresh_line_column_width(column); #endif } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/glibext/linecolumn.h b/src/glibext/linecolumn.h index 15baa4c..6dd50f6 100644 --- a/src/glibext/linecolumn.h +++ b/src/glibext/linecolumn.h @@ -27,7 +27,7 @@ #include <stdbool.h> #include <glib-object.h> -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include <gdk/gdk.h> #endif @@ -46,7 +46,7 @@ struct _line_column line_segment **segments; /* Liste des segments contenus */ size_t count; /* Taille de cette liste */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT int max_width; /* Largeur max. de l'espace */ #endif @@ -59,7 +59,7 @@ void init_line_column(line_column *); /* Réinitialise une colonne de ligne. */ void reset_line_column(line_column *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Recalcule la largeur d'une colonne de segments. */ void refresh_line_column_width(line_column *); @@ -75,7 +75,7 @@ size_t append_text_to_line_column(line_column *, const char *, size_t, Rendering /* Remplace un fragment de texte dans une colonne de ligne. */ void replace_text_in_line_column(line_column *, size_t, const char *, size_t); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Indique l'indice du premier contenu de la colonne. */ bool get_line_column_first_content_index(const line_column *, size_t *); diff --git a/src/glibext/linesegment.c b/src/glibext/linesegment.c index ec8cc96..192e030 100644 --- a/src/glibext/linesegment.c +++ b/src/glibext/linesegment.c @@ -35,7 +35,7 @@ #include "../common/extstr.h" #include "../common/fnv1a.h" #include "../core/paths.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "../gtkext/rendering.h" #endif @@ -82,7 +82,7 @@ static const char *_segment_names[RTT_COUNT] = { }; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Compléments à Cairo */ @@ -121,7 +121,7 @@ struct _line_segment { gint ref_count; /* Compteur de références */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT rendering_pattern_t *pattern; /* Propriétés du rendu */ #else RenderingTagType type; /* Type de rendu attendu */ @@ -155,7 +155,7 @@ static void release_shared_segment_content(line_segment *); /* -------------------- GESTION OPTIMALE D'UNE LISTE DE CONTENUS -------------------- */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Liste identifiant un ensemble de segments */ struct _segcnt_list @@ -180,7 +180,7 @@ bool selection_list_has_segment_content(const segcnt_list *, const line_segment /* ---------------------------------------------------------------------------------- */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -330,7 +330,7 @@ static bool is_line_segment_equal(const line_segment *content, const line_segmen { bool result; /* Résultat à retourner */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT result = (content->pattern == other->pattern); #else result = (content->type == other->type); @@ -477,7 +477,7 @@ line_segment *get_new_line_segment(RenderingTagType type, const char *text, size else content = (line_segment *)malloc(sizeof(line_segment) + length + 1); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT content->pattern = &_seg_params.patterns[type]; #else content->type = type; @@ -552,7 +552,7 @@ RenderingTagType get_line_segment_type(const line_segment *segment) { RenderingTagType result; /* Résultat à renvoyer */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT result = (RenderingTagType)(segment->pattern - _seg_params.patterns); #else result = segment->type; @@ -578,7 +578,7 @@ RenderingTagType get_line_segment_type(const line_segment *segment) char *get_line_segment_text(const line_segment *segment, bool markup) { -#ifndef HAVE_GTK_SUPPORT +#ifndef INCLUDE_GTK_SUPPORT char *result; /* Description à renvoyer */ @@ -672,7 +672,7 @@ char *get_line_segment_text(const line_segment *segment, bool markup) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** @@ -1010,7 +1010,7 @@ void export_line_segment(const line_segment *segment, buffer_export_context *ctx /* ---------------------------------------------------------------------------------- */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/glibext/linesegment.h b/src/glibext/linesegment.h index 99837f9..4859fbb 100644 --- a/src/glibext/linesegment.h +++ b/src/glibext/linesegment.h @@ -27,13 +27,13 @@ #include <glib-object.h> #include <stdbool.h> -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include <gdk/gdk.h> # include <pango/pango.h> #endif -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Liste identifiant un ensemble de segments */ typedef struct _segcnt_list segcnt_list; @@ -45,7 +45,7 @@ typedef struct _segcnt_list segcnt_list; /* ------------------------ NATURE POUR UN FRAGMENT DE TEXTE ------------------------ */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Procède à l'initialisation des paramètres de rendu de texte. */ bool load_segment_rendering_parameters(void); @@ -136,7 +136,7 @@ RenderingTagType get_line_segment_type(const line_segment *); /* Fournit le texte brut conservé dans le segment. */ char *get_line_segment_text(const line_segment *, bool); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Fournit la quantité de pixels requise pour l'impression. */ gint get_line_segment_width(const line_segment *); @@ -185,7 +185,7 @@ typedef struct _buffer_export_context } buffer_export_context; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Exporte tous les styles utilisés par des segments. */ void export_line_segment_style(buffer_export_context *, BufferExportType); @@ -200,7 +200,7 @@ void export_line_segment(const line_segment *, buffer_export_context *, BufferEx /* -------------------- GESTION OPTIMALE D'UNE LISTE DE CONTENUS -------------------- */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Initilise une liste de contenus de segments. */ segcnt_list *init_segment_content_list(void); diff --git a/src/glibext/notifier.h b/src/glibext/notifier.h index c1023d6..bfb626e 100644 --- a/src/glibext/notifier.h +++ b/src/glibext/notifier.h @@ -31,7 +31,7 @@ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "../gtkext/gtkstatusstack.h" #else diff --git a/src/gui/dialogs/about.c b/src/gui/dialogs/about.c index 574c7f2..dd2faa3 100644 --- a/src/gui/dialogs/about.c +++ b/src/gui/dialogs/about.c @@ -30,9 +30,6 @@ #include <gdk/gdkkeysyms.h> -#include <config.h> - - #include "../../gtkext/easygtk.h" diff --git a/src/gui/panels/welcome.c b/src/gui/panels/welcome.c index 14e88c5..60593d1 100644 --- a/src/gui/panels/welcome.c +++ b/src/gui/panels/welcome.c @@ -32,7 +32,6 @@ #include <string.h> -#include <config.h> #include <i18n.h> @@ -31,12 +31,11 @@ #include <stdlib.h> #include <string.h> #include <strings.h> -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include <gtk/gtk.h> #endif -#include <config.h> #include <i18n.h> @@ -356,7 +355,7 @@ int main(int argc, char **argv) /* Initialisation de GTK */ g_set_prgname("Chrysalide Hub"); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT gtk_init(&argc, &argv); #endif @@ -31,12 +31,11 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include <gtk/gtk.h> #endif -#include <config.h> #include <i18n.h> @@ -52,7 +51,7 @@ #include "core/paths.h" #include "core/queue.h" #include "glibext/delayed.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include "gui/editor.h" # include "gui/core/core.h" # include "gui/core/global.h" @@ -67,7 +66,7 @@ static void show_chrysalide_help(const char *); /* Affiche des indications sur la version courante du programme. */ static void show_chrysalide_version(void); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Recharge le dernier projet ouvert s'il existe. */ static gboolean load_last_project(GGenConfig *); @@ -194,7 +193,7 @@ int main(int argc, char **argv) bool show_help; /* Affichage de l'aide ? */ bool show_version; /* Affichage de la version ? */ LogMessageType verbosity; /* Niveau de filtre de message */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT bool batch_mode; /* Exécution sans GUI ? */ #endif bool save; /* Sauvegarde du cache ? */ @@ -203,7 +202,7 @@ int main(int argc, char **argv) int ret; /* Bilan d'un appel */ char *edir; /* Répertoire de base effectif */ bool status; /* Bilan d'opérations */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT GtkWidget *editor; /* Fenêtre graphique */ GGenConfig *config; /* Configuration globale */ bool welcome; /* Affichage de la bienvenue ? */ @@ -237,7 +236,7 @@ int main(int argc, char **argv) show_version = false; verbosity = LMT_INFO; -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT batch_mode = false; #endif save = false; @@ -263,7 +262,7 @@ int main(int argc, char **argv) break; case 'b': -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT batch_mode = true; #endif break; @@ -310,13 +309,13 @@ int main(int argc, char **argv) /* Initialisation de GTK */ g_set_prgname("Chrysalide"); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT gtk_init(&argc, &argv); #endif /* Initialisation du programme */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT if (batch_mode) #endif set_batch_mode(); @@ -328,7 +327,7 @@ int main(int argc, char **argv) /* Création de l'interface */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT if (!batch_mode) { @@ -356,7 +355,7 @@ int main(int argc, char **argv) init_all_plugins(true); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT config = get_main_configuration(); @@ -382,7 +381,7 @@ int main(int argc, char **argv) /* Charge le dernier projet ? */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT if (batch_mode) welcome = true; @@ -415,7 +414,7 @@ int main(int argc, char **argv) if (ret == 0) { -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT project = g_study_project_open(prj_filename, !batch_mode); #else project = g_study_project_open(prj_filename, false); @@ -447,7 +446,7 @@ int main(int argc, char **argv) result = open_binaries(argv + optind, argc - optind); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT if (batch_mode) @@ -464,7 +463,7 @@ int main(int argc, char **argv) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT else gtk_main(); @@ -477,7 +476,7 @@ int main(int argc, char **argv) no_internal_server: -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT exit_complete_gui: #endif @@ -487,7 +486,7 @@ int main(int argc, char **argv) exit_all_plugins(); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT if (!batch_mode) unload_all_gui_components(); @@ -514,7 +513,7 @@ int main(int argc, char **argv) } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/plugins/pglist.h b/src/plugins/pglist.h index 9cc6aee..9063e78 100644 --- a/src/plugins/pglist.h +++ b/src/plugins/pglist.h @@ -27,7 +27,7 @@ #include <stdbool.h> -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT # include <gtk/gtk.h> #endif diff --git a/src/plugins/plugin-int.h b/src/plugins/plugin-int.h index db1cbb0..067edcb 100644 --- a/src/plugins/plugin-int.h +++ b/src/plugins/plugin-int.h @@ -57,7 +57,7 @@ typedef void (* pg_handle_content_fc) (const GPluginModule *, PluginAction, GBin /* Procède à une opération liée à un contenu chargé. */ typedef void (* pg_handle_loaded_fc) (const GPluginModule *, PluginAction, GLoadedContent *, wgroup_id_t, GtkStatusStack *); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Complète une liste de resources pour thème. */ typedef void (* pg_include_theme_fc) (const GPluginModule *, PluginAction, gboolean, char ***, size_t *); @@ -119,7 +119,7 @@ struct _GPluginModuleClass pg_get_modname_fc get_modname; /* Fourniture du nom brut */ -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT pg_include_theme_fc include_theme; /* Extension d'un thème */ pg_notify_panel_fc notify_panel; /* Création de panneau */ pg_notify_docking_fc notify_docking; /* Affichage ou retrait */ diff --git a/src/plugins/plugin.c b/src/plugins/plugin.c index 1ef90fb..0281617 100644 --- a/src/plugins/plugin.c +++ b/src/plugins/plugin.c @@ -669,7 +669,7 @@ static void g_plugin_module_init_gclass(GPluginModuleClass *class, GModule *modu switch (action) { case PGA_GUI_THEME: -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT load_plugin_symbol(module, "chrysalide_plugin_include_theme", &class->include_theme); #endif @@ -688,14 +688,14 @@ static void g_plugin_module_init_gclass(GPluginModuleClass *class, GModule *modu switch (action) { case PGA_PANEL_CREATION: -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT load_plugin_symbol(module, "chrysalide_plugin_on_panel_creation", &class->notify_panel); #endif break; case PGA_PANEL_DOCKING: -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT load_plugin_symbol(module, "chrysalide_plugin_on_panel_docking", &class->notify_docking); #endif @@ -1429,7 +1429,7 @@ gpointer g_plugin_module_build_type_instance(GPluginModule *plugin, PluginAction } -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /****************************************************************************** diff --git a/src/plugins/plugin.h b/src/plugins/plugin.h index aac5f0d..b13608f 100644 --- a/src/plugins/plugin.h +++ b/src/plugins/plugin.h @@ -37,7 +37,7 @@ #include "../format/preload.h" #include "../glibext/configuration.h" #include "../glibext/notifier.h" -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT #include "../gui/panel.h" #endif @@ -121,7 +121,7 @@ void g_plugin_module_notify_plugins_loaded(GPluginModule *, PluginAction, void * /* Crée une instance à partir d'un type dynamique externe. */ gpointer g_plugin_module_build_type_instance(GPluginModule *, PluginAction, GType); -#ifdef HAVE_GTK_SUPPORT +#ifdef INCLUDE_GTK_SUPPORT /* Complète une liste de resources pour thème. */ void g_plugin_module_include_theme(const GPluginModule *, PluginAction, gboolean, char ***, size_t *); diff --git a/src/plugins/self.h b/src/plugins/self.h index 6a2e12d..3c14a0a 100644 --- a/src/plugins/self.h +++ b/src/plugins/self.h @@ -26,9 +26,6 @@ #define _PLUGINS_SELF_H -#include <config.h> - - #ifndef _PLUGINS_PLUGIN_H # include "plugin.h" #endif @@ -28,7 +28,6 @@ #include <stdlib.h> -#include <config.h> #include <i18n.h> |