wok-next view greenbone-security-assistant/stuff/patches/gsa.patch @ rev 20916

libopenraw, abiword: update deps; boost: pack unpacked libs
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Aug 21 05:42:25 2018 +0300 (2018-08-21)
parents
children
line source
1 Unsuccessful attempt to redefine G_LOG_FATAL_MASK:
2
3 In file included from /usr/include/glib-2.0/glib.h:62:0,
4 from ${src}/src/gsad.c:62:
5 /usr/include/glib-2.0/glib/gmessages.h:70:0: error: "G_LOG_FATAL_MASK" redefined [-Werror]
6 #define G_LOG_FATAL_MASK (G_LOG_FLAG_RECURSION | G_LOG_LEVEL_ERROR)
7
8 ${src}/src/gsad.c:54:0: note: this is the location of the previous definition
9 #define G_LOG_FATAL_MASK G_LOG_LEVEL_ERROR
10
11
12 --- a/src/gsad.c
13 +++ b/src/gsad.c
14 @@ -47,12 +47,6 @@
15 * \verbinclude COPYING
16 */
17
18 -/**
19 - * @brief The Glib fatal mask, redefined to leave out G_LOG_FLAG_RECURSION.
20 - */
21 -#undef G_LOG_FATAL_MASK
22 -#define G_LOG_FATAL_MASK G_LOG_LEVEL_ERROR
23 -
24 #define _GNU_SOURCE /* for strcasecmp */
25
26 #include <arpa/inet.h>
27 @@ -5095,7 +5089,7 @@
28 setup_log_handlers (log_config);
29 /* Set to ensure that recursion is left out, in case two threads log
30 * concurrently. */
31 - g_log_set_always_fatal (G_LOG_FATAL_MASK);
32 + g_log_set_always_fatal (G_LOG_LEVEL_ERROR);
33
34 /* Finish processing the command line options. */
35