From e3ed2939ec124b74e9e27eb1f2b8d503ed3b63e2 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Sun, 28 Mar 2010 14:49:18 +0000
Subject: [PATCH] Upstream tarball 10059

---
 .svn-revision                     |  2 +-
 src/Constants.h                   | 27 +++++++++++++++++++++++++++
 src/KnownFile.h                   | 27 +--------------------------
 src/libs/ec/cpp/ECSpecialTags.cpp |  3 ++-
 4 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index 5abb999e..b274339b 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-10058
+10059
diff --git a/src/Constants.h b/src/Constants.h
index 86de1178..39afaf3f 100644
--- a/src/Constants.h
+++ b/src/Constants.h
@@ -85,6 +85,33 @@ enum HTTP_Download_File
 	HTTP_GeoIP
 };
 
+// KnownFile constants
+
+#define	PS_READY			0
+#define	PS_EMPTY			1
+#define PS_WAITINGFORHASH		2
+#define PS_HASHING			3
+#define PS_ERROR			4
+#define	PS_INSUFFICIENT			5
+#define	PS_UNKNOWN			6
+#define PS_PAUSED			7
+#define PS_COMPLETING			8
+#define PS_COMPLETE			9
+#define PS_ALLOCATING			10
+
+
+#define PR_VERYLOW			4 // I Had to change this because
+					  // it didn't save negative number
+					  // correctly.. Had to modify the
+					  // sort function for this change..
+#define PR_LOW				0 //*
+#define PR_NORMAL			1 // Don't change this - needed for
+					  // edonkey clients and server!
+#define PR_HIGH				2 //*
+#define PR_VERYHIGH			3
+#define PR_AUTO				5
+#define PR_POWERSHARE			6 //added for powershare (deltaHF)
+
 
 #endif
 // File_checked_for_headers
diff --git a/src/KnownFile.h b/src/KnownFile.h
index 4c13f649..5944f8df 100644
--- a/src/KnownFile.h
+++ b/src/KnownFile.h
@@ -42,32 +42,7 @@
 #include <ec/cpp/ECSpecialTags.h>
 #endif
 
-
-#define	PS_READY			0
-#define	PS_EMPTY			1
-#define PS_WAITINGFORHASH		2
-#define PS_HASHING			3
-#define PS_ERROR			4
-#define	PS_INSUFFICIENT			5
-#define	PS_UNKNOWN			6
-#define PS_PAUSED			7
-#define PS_COMPLETING			8
-#define PS_COMPLETE			9
-#define PS_ALLOCATING			10
-
-
-#define PR_VERYLOW			4 // I Had to change this because
-					  // it didn't save negative number
-					  // correctly.. Had to modify the
-					  // sort function for this change..
-#define PR_LOW				0 //*
-#define PR_NORMAL			1 // Don't change this - needed for
-					  // edonkey clients and server!
-#define PR_HIGH				2 //*
-#define PR_VERYHIGH			3
-#define PR_AUTO				5
-#define PR_POWERSHARE			6 //added for powershare (deltaHF)
-
+#include "Constants.h"		// Needed for PS_*, PR_*
 
 class CUpDownClient;
 class CFileDataIO;
diff --git a/src/libs/ec/cpp/ECSpecialTags.cpp b/src/libs/ec/cpp/ECSpecialTags.cpp
index d037c694..3e588d8b 100644
--- a/src/libs/ec/cpp/ECSpecialTags.cpp
+++ b/src/libs/ec/cpp/ECSpecialTags.cpp
@@ -29,7 +29,8 @@
 
 #include <common/Format.h>		// Needed for CFormat
 
-#include "../../../KnownFile.h"		// Needed for PS_*
+#include "../../../OtherFunctions.h"	// Needed for CastXtoY
+#include "../../../Constants.h"			// Needed for PS_*
 
 wxString CEC_PartFile_Tag::GetFileStatusString() const
 {
-- 
2.11.4.GIT