From: Yuuki Harano <masm+github@masm11.me>
Date: Tue, 23 Nov 2021 13:59:18 +0000 (+0900)
Subject: Enclose pgtk changes within #ifdef
X-Git-Tag: emacs-29.0.90~3655
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a68575a8146277bd08b4d09b7ca4329c0e5212e0;p=emacs.git

Enclose pgtk changes within #ifdef

* src/emacsgtkfixed.c:
* src/emacsgtkfixed.h:
---

diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 49c3dab9211..78c952f8054 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -51,6 +51,9 @@ static void emacs_fixed_get_preferred_width  (GtkWidget *widget,
 static void emacs_fixed_get_preferred_height (GtkWidget *widget,
                                               gint      *minimum,
                                               gint      *natural);
+#ifndef HAVE_PGTK
+static GType emacs_fixed_get_type (void);
+#endif
 G_DEFINE_TYPE (EmacsFixed, emacs_fixed, GTK_TYPE_FIXED)
 
 static EmacsFixed *
diff --git a/src/emacsgtkfixed.h b/src/emacsgtkfixed.h
index 9b69bbb99db..4f7a4eb3f71 100644
--- a/src/emacsgtkfixed.h
+++ b/src/emacsgtkfixed.h
@@ -27,8 +27,10 @@ struct frame;
 
 G_BEGIN_DECLS
 
+#ifdef HAVE_PGTK
 #define EMACS_TYPE_FIXED        (emacs_fixed_get_type ())
 #define EMACS_IS_FIXED(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMACS_TYPE_FIXED))
+#endif
 
 struct frame;
 
@@ -47,7 +49,9 @@ struct _EmacsFixedClass
   GtkFixedClass parent_class;
 };
 
+#ifdef HAVE_PGTK
 extern GType emacs_fixed_get_type (void);
+#endif
 
 extern GtkWidget *emacs_fixed_new (struct frame *f);