diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-17 23:45:02 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-17 23:45:23 -0700 |
| commit | 658aa2dae8093fede8c823090c67e02756dd6ed5 (patch) | |
| tree | 3c64b4b11c69c71ccb36c3efade7dda16dd3b22e /src | |
| parent | 1df7173eb23510ef5faabede04a487955aec2917 (diff) | |
| download | emacs-658aa2dae8093fede8c823090c67e02756dd6ed5.tar.gz | |
Port to GTK with strict C99 compiler
* 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).
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacsgtkfixed.c | 3 | ||||
| -rw-r--r-- | src/emacsgtkfixed.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index cebd7b613c7..ca0bbfbb866 100644 --- a/src/emacsgtkfixed.c +++ b/src/emacsgtkfixed.c @@ -27,13 +27,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "emacsgtkfixed.h" /* 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 ignored "-Wunused-local-typedefs" #endif typedef struct _EmacsFixed EmacsFixed; -typedef struct _EmacsFixedPrivate EmacsFixedPrivate; typedef struct _EmacsFixedClass EmacsFixedClass; struct _EmacsFixedPrivate diff --git a/src/emacsgtkfixed.h b/src/emacsgtkfixed.h index 3d6a76ab570..0d09525e02a 100644 --- a/src/emacsgtkfixed.h +++ b/src/emacsgtkfixed.h @@ -30,7 +30,6 @@ G_BEGIN_DECLS struct frame; typedef struct _EmacsFixedPrivate EmacsFixedPrivate; -typedef struct _EmacsFixedClass EmacsFixedClass; struct _EmacsFixed { |