Change FSF Address

[~andy/gtk] / gdk / x11 / MwmUtil.h

diff --git a/gdk/x11/MwmUtil.h b/gdk/x11/MwmUtil.h
index 3628e9c0ce723432187b2b40ec30f0647942adca..5985b4551d7c88edae965141dcfb2220804cf47a 100644 (file)
--- a/gdk/x11/MwmUtil.h
+++ b/gdk/x11/MwmUtil.h
@@ -17,9 +17,16 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
+ *
+ * * Feb 21 1999 - George Lebl (jirka@5z.com)
+ *                 Owen Taylor (otaylor@redhat.com)
+ *
+ *   Modified so that the MotifWmHints structure defined here
+ *   is suitable for client side use on 64-bit architectures.
+ *   X expects fields with a format of 32 to be longs, even
+ *   when sizeof(long) == 8.
  **/
 
 #ifndef MWMUTIL_H_INCLUDED
@@ -27,16 +34,14 @@
 
 #include <X11/Xmd.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 typedef struct {
-    CARD32 flags;
-    CARD32 functions;
-    CARD32 decorations;
-    INT32 input_mode;
-    CARD32 status;
+    unsigned long flags;
+    unsigned long functions;
+    unsigned long decorations;
+    long input_mode;
+    unsigned long status;
 } MotifWmHints, MwmHints;
 
 #define MWM_HINTS_FUNCTIONS     (1L << 0)
@@ -99,11 +104,11 @@ typedef MotifWmInfo MwmInfo;
  * _MWM_HINTS property
  */
 typedef struct {
-    CARD32 flags;
-    CARD32 functions;
-    CARD32 decorations;
-    INT32 inputMode;
-    CARD32 status;
+    unsigned long flags;
+    unsigned long functions;
+    unsigned long decorations;
+    long inputMode;
+    unsigned long status;
 } PropMotifWmHints;
 
 typedef PropMotifWmHints PropMwmHints;
@@ -115,8 +120,8 @@ typedef PropMotifWmHints PropMwmHints;
  * _MWM_INFO property, slight return
  */
 typedef struct {
-    CARD32 flags;
-    CARD32 wmWindow;
+    unsigned long flags;
+    unsigned long wmWindow;
 } PropMotifWmInfo;
 
 typedef PropMotifWmInfo PropMwmInfo;
@@ -124,8 +129,6 @@ typedef PropMotifWmInfo PropMwmInfo;
 #define PROP_MOTIF_WM_INFO_ELEMENTS 2
 #define PROP_MWM_INFO_ELEMENTS PROP_MOTIF_WM_INFO_ELEMENTS
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* MWMUTIL_H_INCLUDED */