Download as
Browse Code »

Commit 6993cb42531cd611019cde82f388c7fe468f38ab

Authored by Perry Werneck
1 parent 8099e7ad
Exists in master and in 1 other branch develop

Fixing RHEL7 build issues.

Showing 3 changed files with 17 additions and 4 deletions   Show diff stats
hllapi.cbp
  Diff comments   View file @6993cb4
... ... @@ -63,9 +63,6 @@
63 63 </Unit>
64 64 <Unit filename="src/ipc3270c/windows/private.h" />
65 65 <Unit filename="src/ipc3270c/windows/resources.rc" />
66   - <Unit filename="src/plugin/linux/daemon.h" />
67   - <Unit filename="src/plugin/linux/globals.h" />
68   - <Unit filename="src/plugin/linux/service.h" />
69 66 <Unit filename="src/plugin/windows/private.h" />
70 67 <Unit filename="src/plugin/windows/resources.rc" />
71 68 <Unit filename="src/testprograms/hllapi.c">
... ...
src/ipc3270c/linux/globals.h
  Diff comments   View file @6993cb4
... ... @@ -34,6 +34,7 @@
34 34 #define PW3270_DBUS_GLOBALS_H_INCLUDED 1
35 35  
36 36 #include <libintl.h>
  37 + #include <glib.h>
37 38 #include <glib/gi18n.h>
38 39  
39 40 #include <errno.h>
... ... @@ -41,6 +42,13 @@
41 42 #include <lib3270/log.h>
42 43 #include <glib.h>
43 44  
  45 +#if ! GLIB_CHECK_VERSION(2,44,0)
  46 +
  47 + G_GNUC_INTERNAL void hllapi_autoptr_cleanup_generic_gfree(void *p);
  48 + #define g_autofree __attribute__((cleanup(v3270_autoptr_cleanup_generic_gfree)))
  49 +
  50 +#endif // ! GLIB(2,44,0)
  51 +
44 52 //
45 53 // Disabling warning on unused-function defined in dbus-glib-bindings.h
46 54 // warning: 'org_freedesktop_DBus_reload_config' defined but not used [-Wunused-function] ...
... ...
src/ipc3270c/linux/main.c
  Diff comments   View file @6993cb4
... ... @@ -41,6 +41,7 @@
41 41 #include <pw3270/plugin.h>
42 42  
43 43 #include "service.h"
  44 +#include "globals.h"
44 45 #include "dbus-glue.h"
45 46  
46 47 #include <gtk/gtk.h>
... ... @@ -175,5 +176,12 @@
175 176 return lib3270_get_default_session_handle();
176 177 }
177 178  
178   -
  179 +#if ! GLIB_CHECK_VERSION(2,44,0)
  180 +// Reference: https://github.com/ImageMagick/glib/blob/master/glib/glib-autocleanups.h
  181 +void hllapi_autoptr_cleanup_generic_gfree(void *p)
  182 +{
  183 + void **pp = (void**)p;
  184 + g_free (*pp);
  185 +}
  186 +#endif // ! GLIB(2,44,0)
179 187  
... ...