From 959e7640e28249556278634a4bd08fdff6f2d068 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Wed, 4 Nov 2009 11:03:39 +0300
Subject: [PATCH] [8771] Fixed *nix build and small code cleanup.

Thanks to balrok for reporting, and help in resolve/test.
---
 src/game/Mail.h          | 23 +++++++++++++++++++++++
 src/game/SharedDefines.h | 21 ---------------------
 src/shared/revision_nr.h |  2 +-
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/game/Mail.h b/src/game/Mail.h
index b46370e63..c704d406a 100644
--- a/src/game/Mail.h
+++ b/src/game/Mail.h
@@ -23,6 +23,8 @@
 
 struct AuctionEntry;
 class Item;
+class Object;
+class Player;
 
 #define MAIL_BODY_ITEM_TEMPLATE 8383                        // - plain letter, A Dusty Unsent Letter: 889
 #define MAX_MAIL_ITEMS 12
@@ -36,6 +38,27 @@ enum MailMessageType
     MAIL_ITEM           = 5,                                // client send CMSG_ITEM_QUERY on this mailmessagetype
 };
 
+enum MailCheckMask
+{
+    MAIL_CHECK_MASK_NONE        = 0x00,
+    MAIL_CHECK_MASK_READ        = 0x01,
+    MAIL_CHECK_MASK_AUCTION     = 0x04,
+    MAIL_CHECK_MASK_COD_PAYMENT = 0x08,
+    MAIL_CHECK_MASK_RETURNED    = 0x10
+};
+
+// gathered from Stationery.dbc
+enum MailStationery
+{
+    MAIL_STATIONERY_UNKNOWN =  1,
+    MAIL_STATIONERY_NORMAL  = 41,
+    MAIL_STATIONERY_GM      = 61,
+    MAIL_STATIONERY_AUCTION = 62,
+    MAIL_STATIONERY_VAL     = 64,
+    MAIL_STATIONERY_CHR     = 65,
+    MAIL_STATIONERY_ORP     = 67,                           // new in 3.2.2
+};
+
 enum MailState
 {
     MAIL_STATE_UNCHANGED = 1,
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index 279391595..c6ce091f5 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -2620,27 +2620,6 @@ enum BattleGroundTypeId
 };
 #define MAX_BATTLEGROUND_TYPE_ID 33
 
-enum MailCheckMask
-{
-    MAIL_CHECK_MASK_NONE        = 0x00,
-    MAIL_CHECK_MASK_READ        = 0x01,
-    MAIL_CHECK_MASK_AUCTION     = 0x04,
-    MAIL_CHECK_MASK_COD_PAYMENT = 0x08,
-    MAIL_CHECK_MASK_RETURNED    = 0x10
-};
-
-// gathered from Stationery.dbc
-enum MailStationery
-{
-    MAIL_STATIONERY_UNKNOWN =  1,
-    MAIL_STATIONERY_NORMAL  = 41,
-    MAIL_STATIONERY_GM      = 61,
-    MAIL_STATIONERY_AUCTION = 62,
-    MAIL_STATIONERY_VAL     = 64,
-    MAIL_STATIONERY_CHR     = 65,
-    MAIL_STATIONERY_ORP     = 67,                           // new in 3.2.2
-};
-
 enum MailResponseType
 {
     MAIL_SEND               = 0,
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 24ab70cac..e336ad1d1 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8770"
+ #define REVISION_NR "8771"
 #endif // __REVISION_NR_H__