Resolving name collisions.

2009-07-18 21:36:28 +00:00
parent 196d9bd27c
commit deed6320c6
27 changed files with 326 additions and 326 deletions
@@ -12,8 +12,8 @@

 /* Including external dependencies */
 #include "NonZeroId.h"
-#include "GameState.h"
-#include "PlayerAction.h"
+#include "NetGameState.h"
+#include "NetPlayerAction.h"
 #include <NativeInteger.h>
 #include <NativeEnumerated.h>
 #include <constr_SEQUENCE.h>
@@ -32,8 +32,8 @@ typedef enum rejectionReason {
 /* YourActionRejectedMessage */
 typedef struct YourActionRejectedMessage {
 	NonZeroId_t	 gameId;
-	GameState_t	 gameState;
-	PlayerAction_t	 yourAction;
+	NetGameState_t	 gameState;
+	NetPlayerAction_t	 yourAction;
 	long	 yourRelativeBet;
 	long	 rejectionReason;
 	/*