procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port to GTK with strict C99 compiler

Browse source 
* src/emacsgtkfixed.c: Use workaround for GNOME bug 683906 only
in glib 2.35.6 and earlier, since the bug is fixed in 2.35.7.
* src/emacsgtkfixed.c (EmacsFixedPrivate):
* src/emacsgtkfixed.h (EmacsFixedClass):
Remove duplicate typedef, which strict C99 does not allow (Bug#23003).
This commit is contained in:
Paul Eggert 2016-03-17 23:45:02 -07:00
parent 1df7173eb2
commit 658aa2dae8
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/emacsgtkfixed.c
View file

@ -27,13 +27,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "emacsgtkfixed.h" #include "emacsgtkfixed.h"
/* Silence a bogus diagnostic; see GNOME bug 683906. */ /* Silence a bogus diagnostic; see GNOME bug 683906. */
#if 4 < __GNUC__ + (7 <= __GNUC_MINOR__) #if 4 < __GNUC__ + (7 <= __GNUC_MINOR__) && ! GLIB_CHECK_VERSION (2, 35, 7)
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-local-typedefs" # pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#endif #endif
typedef struct _EmacsFixed EmacsFixed; typedef struct _EmacsFixed EmacsFixed;
typedef struct _EmacsFixedPrivate EmacsFixedPrivate;
typedef struct _EmacsFixedClass EmacsFixedClass; typedef struct _EmacsFixedClass EmacsFixedClass;
struct _EmacsFixedPrivate struct _EmacsFixedPrivate

1
src/emacsgtkfixed.h
View file

@ -30,7 +30,6 @@ G_BEGIN_DECLS
struct frame; struct frame;
typedef struct _EmacsFixedPrivate EmacsFixedPrivate; typedef struct _EmacsFixedPrivate EmacsFixedPrivate;
typedef struct _EmacsFixedClass EmacsFixedClass;
struct _EmacsFixed struct _EmacsFixed
{ {