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

2 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 8bb4cdaf..cfd870a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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
 	implementation. Closes #446535.
 
diff --git a/src/effects.h b/src/effects.h
index 6fc8bf94..5ae7bcb5 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;