From b996cd03beb3c96c467059e97120f8a2ba81a3ef Mon Sep 17 00:00:00 2001
From: Damien Carbery <damien.carbery@sun.com>
Date: Sun, 17 Jun 2007 02:55:07 +0000
Subject: [PATCH] MetaCloseEffect and MetaFocusEffect, which were empty
 structs, #ifdeffed

2007-06-16  Damien Carbery  <damien.carbery@sun.com>

        * effects.h: MetaCloseEffect and MetaFocusEffect, which were empty
        structs, #ifdeffed out because they broke the build on Solaris.
        Closes #397296.



svn path=/trunk/; revision=3244
---
 ChangeLog     | 6 ++++++
 src/effects.h | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8bb4cdafc..cfd870a52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-16  Damien Carbery  <damien.carbery@sun.com>
+
+        * effects.h: MetaCloseEffect and MetaFocusEffect, which were empty
+	structs, #ifdeffed out because they broke the build on Solaris.
+	Closes #397296.
+
 2007-06-16  Damien Carbery  <damien.carbery@sun.com>
 
 	* window.h: make prototype of meta_window_unqueue match
diff --git a/src/effects.h b/src/effects.h
index 6fc8bf943..5ae7bcb5c 100644
--- a/src/effects.h
+++ b/src/effects.h
@@ -69,6 +69,8 @@ typedef struct
   MetaRectangle icon_rect;
 } MetaMinimizeEffect, MetaUnminimizeEffect;
 
+#if 0
+/* Solaris abhors an empty struct. #397296. */
 typedef struct
 {
     
@@ -77,6 +79,7 @@ typedef struct
 typedef struct
 {
 } MetaFocusEffect;
+#endif
 
 struct MetaEffect
 {
@@ -88,8 +91,11 @@ struct MetaEffect
   {
     MetaMinimizeEffect	    minimize;
     MetaUnminimizeEffect    unminimize;
+#if 0
+    /* These don't currently exist, so we aren't using them. #397296. */
     MetaCloseEffect	    close;
     MetaFocusEffect	    focus;
+#endif
   } u;
   
   MetaEffectPriv *priv;