git » fp-git.git » commit ed1c266

joined dat.c branches

author ecalot
2005-03-23 08:26:18 UTC
committer ecalot
2005-03-23 08:26:18 UTC
parent d65c488b00702bd1fe7f6ae901c50153ecbe20c8

joined dat.c branches

PR/src/include/common.h +0 -1
PR/src/include/dat.h +2 -0
PR/src/include/pr.h +0 -1
PR/src/lib/layers/autodetect.c +1 -0
PR/src/lib/layers/dat.c +0 -1
PR/src/lib/layers/idlist.c +1 -0
PR/src/lib/pr.c +1 -0
PR/src/lib/xml/tree.c +1 -0
PR/src/lib/xml/unknown.c +1 -0

diff --git a/PR/src/include/common.h b/PR/src/include/common.h
index 86e9b03..c204a9c 100644
--- a/PR/src/include/common.h
+++ b/PR/src/include/common.h
@@ -110,7 +110,6 @@ void prSetOutput(FILE* output);
 #define DEFAULT_BACKUP_EXTENSION "bak"
 
 /* Define max & min's */
-#define MAX_RES_COUNT            25000
 #define MAX_FILENAME_SIZE        260
 
 /* Path defines */
diff --git a/PR/src/include/dat.h b/PR/src/include/dat.h
index a162a60..02fb013 100644
--- a/PR/src/include/dat.h
+++ b/PR/src/include/dat.h
@@ -36,6 +36,8 @@ dat.h: Princed Resources : DAT library headers
 
 #include "resources.h"
 
+#define MAX_RES_COUNT            25000
+
 #define PR_DAT_INCLUDE_DATREAD
 #define PR_DAT_INCLUDE_DATWRITE
 
diff --git a/PR/src/include/pr.h b/PR/src/include/pr.h
index 86e9b03..c204a9c 100644
--- a/PR/src/include/pr.h
+++ b/PR/src/include/pr.h
@@ -110,7 +110,6 @@ void prSetOutput(FILE* output);
 #define DEFAULT_BACKUP_EXTENSION "bak"
 
 /* Define max & min's */
-#define MAX_RES_COUNT            25000
 #define MAX_FILENAME_SIZE        260
 
 /* Path defines */
diff --git a/PR/src/lib/layers/autodetect.c b/PR/src/lib/layers/autodetect.c
index 74c6291..53a8c9a 100644
--- a/PR/src/lib/layers/autodetect.c
+++ b/PR/src/lib/layers/autodetect.c
@@ -45,6 +45,7 @@ resources.c: Princed Resources : Resource Handler
 #include "disk.h"
 #include "memory.h"
 #include "resources.h"
+#include "dat.h" /* MAX_RES_COUNT */
 #include "compress.h"
 
 extern FILE* outputStream;
diff --git a/PR/src/lib/layers/dat.c b/PR/src/lib/layers/dat.c
index 50f513d..b4a2f57 100644
--- a/PR/src/lib/layers/dat.c
+++ b/PR/src/lib/layers/dat.c
@@ -37,7 +37,6 @@ dat.c: Princed Resources : DAT library
 
 #include "disk.h"
 #include "dat.h"
-#include "pr.h"
 
 /***************************************************************\
 |                     DAT reading primitives                    |
diff --git a/PR/src/lib/layers/idlist.c b/PR/src/lib/layers/idlist.c
index 74c6291..53a8c9a 100644
--- a/PR/src/lib/layers/idlist.c
+++ b/PR/src/lib/layers/idlist.c
@@ -45,6 +45,7 @@ resources.c: Princed Resources : Resource Handler
 #include "disk.h"
 #include "memory.h"
 #include "resources.h"
+#include "dat.h" /* MAX_RES_COUNT */
 #include "compress.h"
 
 extern FILE* outputStream;
diff --git a/PR/src/lib/pr.c b/PR/src/lib/pr.c
index 61e886f..820de5e 100644
--- a/PR/src/lib/pr.c
+++ b/PR/src/lib/pr.c
@@ -54,6 +54,7 @@ pr.c: Main source file for Princed Resources library
 #include "pr.h"
 
 #include "compress.h"
+#include "dat.h" /* MAX_RES_COUNT */
 
 #include "extract.h"
 #include "compile.h"
diff --git a/PR/src/lib/xml/tree.c b/PR/src/lib/xml/tree.c
index 74c6291..53a8c9a 100644
--- a/PR/src/lib/xml/tree.c
+++ b/PR/src/lib/xml/tree.c
@@ -45,6 +45,7 @@ resources.c: Princed Resources : Resource Handler
 #include "disk.h"
 #include "memory.h"
 #include "resources.h"
+#include "dat.h" /* MAX_RES_COUNT */
 #include "compress.h"
 
 extern FILE* outputStream;
diff --git a/PR/src/lib/xml/unknown.c b/PR/src/lib/xml/unknown.c
index 74c6291..53a8c9a 100644
--- a/PR/src/lib/xml/unknown.c
+++ b/PR/src/lib/xml/unknown.c
@@ -45,6 +45,7 @@ resources.c: Princed Resources : Resource Handler
 #include "disk.h"
 #include "memory.h"
 #include "resources.h"
+#include "dat.h" /* MAX_RES_COUNT */
 #include "compress.h"
 
 extern FILE* outputStream;