not compiling yet

diff --cc configure.ac
Simple merge

diff --cc src/emacsgtkfixed.c
index d23f3e21f2472fe8fa1054fbe64bcf8c72d29d70,d10185072cc804497825d769d6210904b8ded4da..c190862ab7d1e33cb9679cd498a3afbda61c7743
--- 1/src/emacsgtkfixed.c
--- 2/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@@ -35,26 -33,26 +35,26 @@@ along with GNU Emacs.  If not, see <htt
  # pragma GCC diagnostic ignored "-Wunused-local-typedefs"
  #endif
  
--#define EMACS_TYPE_FIXED emacs_fixed_get_type ()
--#define EMACS_FIXED(obj) \
--  G_TYPE_CHECK_INSTANCE_CAST (obj, EMACS_TYPE_FIXED, EmacsFixed)
++//#define EMACS_TYPE_FIXED emacs_fixed_get_type ()
++/* #define EMACS_FIXED(obj) \ */
++/*   G_TYPE_CHECK_INSTANCE_CAST (obj, EMACS_TYPE_FIXED, EmacsFixed) */
  
  typedef struct _EmacsFixed EmacsFixed;
  typedef struct _EmacsFixedPrivate EmacsFixedPrivate;
  typedef struct _EmacsFixedClass EmacsFixedClass;
  
--struct _EmacsFixed
--{
--  GtkFixed container;
++/* struct _EmacsFixed */
++/* { */
++/*   GtkFixed container; */
  
--  /*< private >*/
--  EmacsFixedPrivate *priv;
--};
++/*   /\*< private >*\/ */
++/*   EmacsFixedPrivate *priv; */
++/* }; */
  
--struct _EmacsFixedClass
--{
--  GtkFixedClass parent_class;
--};
++/* struct _EmacsFixedClass */
++/* { */
++/*   GtkFixedClass parent_class; */
++/* }; */
  
  struct _EmacsFixedPrivate
  {

diff --cc src/emacsgtkfixed.h
index 90fb37e521bc04ae3334ab976cfb579a24e37061,3fa294aa41eab95af5603605681986ac873f93fe..b18c541081f9e64dc01aee3b2db7fe5b28545332
--- 1/src/emacsgtkfixed.h
--- 2/src/emacsgtkfixed.h
+++ b/src/emacsgtkfixed.h
@@@ -27,33 -27,7 +27,33 @@@ G_BEGIN_DECL
  
  struct frame;
  
- typedef struct _EmacsFixed              EmacsFixed;
 +#define EMACS_TYPE_FIXED                  (emacs_fixed_get_type ())
 +#define EMACS_FIXED(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMACS_TYPE_FIXED, EmacsFixed))
 +#define EMACS_FIXED_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), EMACS_TYPE_FIXED, EmacsFixedClass))
 +#define EMACS_IS_FIXED(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMACS_TYPE_FIXED))
 +#define EMACS_IS_FIXED_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), EMACS_TYPE_FIXED))
 +#define EMACS_FIXED_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), EMACS_TYPE_FIXED, EmacsFixedClass))
 +
++//typedef struct _EmacsFixed              EmacsFixed;
 +typedef struct _EmacsFixedPrivate       EmacsFixedPrivate;
 +typedef struct _EmacsFixedClass         EmacsFixedClass;
 +
 +struct _EmacsFixed
 +{
 +  GtkFixed container;
 +
 +  /*< private >*/
 +  EmacsFixedPrivate *priv;
 +};
 +
 +
 +struct _EmacsFixedClass
 +{
 +  GtkFixedClass parent_class;
 +};
 +
  extern GtkWidget *emacs_fixed_new (struct frame *f);
 +extern GType emacs_fixed_get_type (void);
  
  G_END_DECLS