From a2b270d00f26e06a24e5f63d9edb0b80f3a583a9 Mon Sep 17 00:00:00 2001
From: Martin Schaffner <schaffnerb@gmx.ch>
Date: Wed, 8 Oct 2003 17:09:48 +0000
Subject: [PATCH] got rid of most warnings issued by cpp-precomp of gcc of Mac
 OS X

---
 ChangeLog     | 5 +++++
 main/multi.h  | 4 ++--
 main/object.h | 8 ++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cfd7ec9f..447b3188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-08
+
+	* main/object.h, main/multi.h: get rid of most warnings issued by
+	cpp-precomp of gcc from Mac OS X dev tools
+
 2003-10-05  Bradley Bell  <btb@icculus.org>
 
 	* NEWS, configure.ac: increment version number
diff --git a/main/multi.h b/main/multi.h
index f63448d6..0a5251ce 100644
--- a/main/multi.h
+++ b/main/multi.h
@@ -1,4 +1,4 @@
-/* $Id: multi.h,v 1.10 2003-10-04 02:58:23 btb Exp $ */
+/* $Id: multi.h,v 1.11 2003-10-08 17:09:48 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -505,7 +505,7 @@ extern bitmap_index multi_player_textures[MAX_NUM_NET_PLAYERS][N_PLAYER_SHIP_TEX
 
 #define NETGAME_NAME_LEN                15
 
-enum __pack__ comp_type {DOS,WIN_32,WIN_95,MAC};
+enum comp_type {DOS,WIN_32,WIN_95,MAC} __pack__ ;
 
 // sigh...the socket structure member was moved away from it's friends.
 // I'll have to create a union for appletalk network info with just
diff --git a/main/object.h b/main/object.h
index 620b3fc5..07422f7f 100644
--- a/main/object.h
+++ b/main/object.h
@@ -1,4 +1,4 @@
-/* $Id: object.h,v 1.5 2003-10-04 03:14:47 btb Exp $ */
+/* $Id: object.h,v 1.6 2003-10-08 17:09:48 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -458,7 +458,7 @@ typedef struct object {
 	union {
 		physics_info phys_info; // a physics object
 		vms_vector   spin_rate; // for spinning objects
-	} __pack__ mtype;
+	} mtype __pack__ ;
 
 	// control info, determined by CONTROL_TYPE
 	union {
@@ -467,13 +467,13 @@ typedef struct object {
 		ai_static       ai_info;
 		light_info      light_info;     // why put this here?  Didn't know what else to do with it.
 		powerup_info    powerup_info;
-	} __pack__ ctype;
+	} ctype __pack__ ;
 
 	// render info, determined by RENDER_TYPE
 	union {
 		polyobj_info    pobj_info;      // polygon model
 		vclip_info      vclip_info;     // vclip
-	} __pack__ rtype;
+	} rtype __pack__ ;
 
 #ifdef WORDS_NEED_ALIGNMENT
 	short   pad2;
-- 
2.39.2