git » fp-git.git » commit ac902d8

diff --git a/PR/src/console/main.c b/PR/src/console/main.c
index e4eb11b..f12b4d7 100644
--- a/PR/src/console/main.c
+++ b/PR/src/console/main.c
@@ -35,10 +35,11 @@ main.c: PR console program parsing routine
  #include "getopt.h"
 #endif
 
-#include "pr.h"
+#include "common.h"
 #include <string.h>
 #include "memory.h"
 #include "filedir.h"
+#include "disk.h" /* MAX_FILENAME_SIZE */
 #include "compress.h" /* setCompressionLevel */
 #include "xmlparse.h" /* free parsed cache */
 
@@ -210,7 +211,7 @@ int main (int argc, char **argv) {
 				} else {
 					/* classify */
 					fprintf(outputStream,PR_TEXT_TASK_CLASSIFY,file);
-					result=prVerifyDatType(file);
+					result=prClassifyDat(file);
 					fprintf(outputStream,PR_TEXT_RESULT,classifyErrors[result+2],result);
 				}
 				free(file);
diff --git a/PR/src/include/common.h b/PR/src/include/common.h
index 64bc431..53f9555 100644
--- a/PR/src/include/common.h
+++ b/PR/src/include/common.h
@@ -19,7 +19,7 @@
 */
 
 /*
-pr.h: Princed Resources : Main header prototypes and definitions
+common.h: Princed Resources : Defines and prototypes common to all PR code
 \xaf\xaf\xaf\xaf
  Copyright 2003 Princed Development Team
   Created: 24 Aug 2003
@@ -36,8 +36,8 @@ pr.h: Princed Resources : Main header prototypes and definitions
   DO NOT remove this copyright notice
 */
 
-#ifndef _PR_H_
-#define _PR_H_
+#ifndef _COMMON_H_
+#define _COMMON_H_
 
 /***************************************************************\
 |                Princed Resource Library Functions             |
@@ -50,41 +50,10 @@ pr.h: Princed Resources : Main header prototypes and definitions
  #define UNIX
 #endif
 
-/* do not #define DLL, use -DDLL as a precompiler option instead */
-#ifdef DLL
-void prSetOutput(FILE* output);
- #ifdef UNIX
-  #define SO
- #endif
-#endif
-
+#ifdef WIN32
 #ifndef OS
- #ifndef UNIX
-  #define OS "Win32"
- #else
-  #define OS ""
- #endif
+#define OS "Win32"
 #endif
-
-/* Debug options */
-/* #define DEB_FLAG */
-/* #define MEM_CHECK */
-
-#ifdef MEM_CHECK
-
-#ifdef malloc
-#undef malloc
-#endif
-
-#include "memory.h"
- #define malloc(a) mymalloc(a,__FILE__,__LINE__)
- #define free(a) myfree(a,__FILE__,__LINE__)
-#endif
-
-#ifdef DEB_FLAG
- #define fld(a) printf(a "\n")
-#else
- #define fld(a)
 #endif
 
 /***************************************************************\
@@ -96,7 +65,7 @@ void prSetOutput(FILE* output);
 \***************************************************************/
 
 #define PR_URL                    "http://www.princed.com.ar"
-#define PR_VERSION                "v1.0-dev2"
+#define PR_VERSION                "v1.0-RC2"
 #define PR_COPY                   "(c) Copyright 2003 - 2005 Princed Development Team"
 
 /***************************************************************\
@@ -110,7 +79,6 @@ void prSetOutput(FILE* output);
 #define DEFAULT_BACKUP_EXTENSION "bak"
 
 /* Define max & min's */
-#define MAX_FILENAME_SIZE        260
 
 /***************************************************************\
 |                        L A N G U A G E                        |
@@ -148,19 +116,14 @@ void prSetOutput(FILE* output);
 |                           Prototypes                          |
 \***************************************************************/
 
-/* Main functions */
-int prExportDat(const char* vDatFile, const char* vDirName, const char* vResFile);
-int prImportDat(const char* vDatFile, const char* vDirName, const char* vResFile);
-int prVerifyDatType(const char* vFiledat);
-
-/* Extra featured functions */
-int prExportDatOpt(const char* vDatFile, const char* vDirName, const char* vResFile,int opt,const char * vDatFileName,const char* datAuthor, const char* backupExtension);
-int prImportDatOpt(const char* vDatFile, const char* vDirName, const char* vResFile,int opt,const char* vDatFileName, const char* backupExtension);
+#include "pr.h"
 
 /***************************************************************\
 |                   Command Line specific options               |
 \***************************************************************/
 
+#define PR_IGNORE_RAW_OPTION
+
 #ifndef PR_IGNORE_RAW_OPTION
 #define PARSING_OPTRAW ,{"raw",         no_argument,       0,'r'},
 #define PARSING_CHRRAW "r"
@@ -213,3 +176,4 @@ PARSING_OPTRAW\
 #define setFlag(a) optionflag|=(a)
 
 #endif
+
diff --git a/PR/src/include/parse.h b/PR/src/include/parse.h
index 3dc4b22..18cf1f6 100644
--- a/PR/src/include/parse.h
+++ b/PR/src/include/parse.h
@@ -36,37 +36,7 @@ xmlparse.h: Princed Resources : xml handling functions headers
 
 int equalsIgnoreCase(const char s1[],const char s2[]);
 
-typedef struct tTag {
-	struct tTag* child;
-	struct tTag* next;
-	char* tag;
-	char* desc;
-	char* path;
-	char* file;
-	char* itemtype;
-	char* name;
-	char* palette;
-	char* type;
-	char* value;
-	char* version;
-	char* number;
-}tTag;
-
 /* Constants */
 #define MAX_VALUE_SIZE 3000
 
-/* Prototypes */
-void  freeTagStructure (tTag* structure);
-tTag* parseXmlFile     (const char* vFile,int* error);
-
-int parseStructure(const char* vFile, tTag** structure);
-void freeParsedStructure(tTag** structure);
-void freeParsingCache();
-
-#ifdef DLL
-tTag* resourceTreeGetChild(tTag* whereAmI);
-tTag* resourceTreeGetNext (tTag* whereAmI);
-int   resourceTreeGetInfo (tTag* whereAmI, char** tag, char** desc, char** path, char** file, char** itemtype, char** name, char** palette, char** type, char** value, char** version, char** number);
-#endif
-
 #endif
diff --git a/PR/src/include/plv.h b/PR/src/include/plv.h
index f5279a0..24b2c24 100644
--- a/PR/src/include/plv.h
+++ b/PR/src/include/plv.h
@@ -62,7 +62,7 @@ plv.h: Princed Resources : PLV prince level files support headers
 
 #include <stdio.h>
 #include "resources.h"
-#include "pr.h" /* for PR_VERSION */
+#include "common.h" /* for PR_VERSION */
 
 int mFormatImportPlv(unsigned char* data, tResource *res);
 int mFormatExportPlv(const unsigned char* data, const char *vFileext,unsigned long int size,unsigned char level, const char* filename, const char* desc, const char* title, const char* vDatAuthor,int optionflag, const char* backupExtension);
diff --git a/PR/src/include/pr.h b/PR/src/include/pr.h
index 64bc431..8f25962 100644
--- a/PR/src/include/pr.h
+++ b/PR/src/include/pr.h
@@ -39,177 +39,66 @@ pr.h: Princed Resources : Main header prototypes and definitions
 #ifndef _PR_H_
 #define _PR_H_
 
-/***************************************************************\
-|                Princed Resource Library Functions             |
-\***************************************************************/
-
-#include <stdio.h>
-
-/* User configuration defines */
-#ifndef WIN32
- #define UNIX
-#endif
-
-/* do not #define DLL, use -DDLL as a precompiler option instead */
-#ifdef DLL
-void prSetOutput(FILE* output);
- #ifdef UNIX
-  #define SO
- #endif
-#endif
-
-#ifndef OS
- #ifndef UNIX
-  #define OS "Win32"
- #else
-  #define OS ""
- #endif
-#endif
-
-/* Debug options */
-/* #define DEB_FLAG */
-/* #define MEM_CHECK */
-
-#ifdef MEM_CHECK
-
-#ifdef malloc
-#undef malloc
-#endif
-
-#include "memory.h"
- #define malloc(a) mymalloc(a,__FILE__,__LINE__)
- #define free(a) myfree(a,__FILE__,__LINE__)
-#endif
-
-#ifdef DEB_FLAG
- #define fld(a) printf(a "\n")
-#else
- #define fld(a)
-#endif
-
-/***************************************************************\
-|             M A I N   P R O G R A M   D E F I N E S           |
-\***************************************************************/
-
-/***************************************************************\
-|                     PR Specific Defines                       |
-\***************************************************************/
-
-#define PR_URL                    "http://www.princed.com.ar"
-#define PR_VERSION                "v1.0-dev2"
-#define PR_COPY                   "(c) Copyright 2003 - 2005 Princed Development Team"
-
-/***************************************************************\
-|                         Other defines                         |
-\***************************************************************/
-
-/* Default Files */
-#define RES_XML_UNKNOWN_XML      "unknown.xml"
-#define RES_XML_RESOURC_XML      "resources.xml"
-
-#define DEFAULT_BACKUP_EXTENSION "bak"
-
-/* Define max & min's */
-#define MAX_FILENAME_SIZE        260
-
-/***************************************************************\
-|                        L A N G U A G E                        |
-\***************************************************************/
-
-#include "en.lang.pr.h"
-
-/* Credits */
-#define PARSING_ABOUT PR_TXT_AUTHORS": \n\
-   "PR_TXT_CODER"\n\
-    Enrique Calot\n\
-\n\
-   "PR_TXT_COD_ASSIST"\n\
-    Santiago Zamora\n\
-\n\
-   "PR_TXT_GFX_COMP"\n\
-    Tammo Jan Dijkema\n\
-    Enrique Calot\n\
-\n\
-   "PR_TXT_GFX_DEV"\n\
-    Tammo Jan Dijkema\n\
-    Anke Balderer\n\
-\n\
-   "PR_TXT_MID"\n\
-    Christian Lundheim\n\
-\n\
-   "PR_TXT_XML"\n\
-    Steven Fayers\n\
-\n\
-   "PR_TXT_TRANSLATION"\n\
-    "PR_TXT_ABOUT_TRANSLATOR"\n\
-\n"
+/* types */
+typedef struct tTag {
+	struct tTag* child;
+	struct tTag* next;
+	char* tag;
+	char* desc;
+	char* path;
+	char* file;
+	char* itemtype;
+	char* name;
+	char* palette;
+	char* type;
+	char* value;
+	char* version;
+	char* number;
+}tTag;
 
 /***************************************************************\
 |                           Prototypes                          |
 \***************************************************************/
+/* The library EXPORTS are:
+ * prExportDat
+ * prExportDatOpt
+ * prImportDat
+ * prImportDatOpt
+ * prVerifyDatType
+ * prSetOutput
+ * parseStructure
+ * resourceTreeGetChild
+ * resourceTreeGetInfo
+ * resourceTreeGetNext
+ * freeParsedStructure
+ * setCompressionLevel
+ * freeParsingCache
+ * freeTagStructure
+ * parseXmlFile
+ */
 
 /* Main functions */
 int prExportDat(const char* vDatFile, const char* vDirName, const char* vResFile);
 int prImportDat(const char* vDatFile, const char* vDirName, const char* vResFile);
-int prVerifyDatType(const char* vFiledat);
+int prClassifyDat(const char* vFiledat);
 
 /* Extra featured functions */
 int prExportDatOpt(const char* vDatFile, const char* vDirName, const char* vResFile,int opt,const char * vDatFileName,const char* datAuthor, const char* backupExtension);
 int prImportDatOpt(const char* vDatFile, const char* vDirName, const char* vResFile,int opt,const char* vDatFileName, const char* backupExtension);
 
-/***************************************************************\
-|                   Command Line specific options               |
-\***************************************************************/
+/* Option functions */
+void prSetOutput(FILE* output);
+void setCompressionLevel(int cl);
+
+/* Xml parsing functions */
+tTag* resourceTreeGetChild(tTag* whereAmI);
+tTag* resourceTreeGetNext (tTag* whereAmI);
+int   resourceTreeGetInfo (tTag* whereAmI, char** tag, char** desc, char** path, char** file, char** itemtype, char** name, char** palette, char** type, char** value, char** version, char** number);
+int parseStructure(const char* vFile, tTag** structure);
+void freeParsedStructure(tTag** structure);
+void freeParsingCache();
+void  freeTagStructure (tTag* structure);
+tTag* parseXmlFile     (const char* vFile,int* error);
 
-#ifndef PR_IGNORE_RAW_OPTION
-#define PARSING_OPTRAW ,{"raw",         no_argument,       0,'r'},
-#define PARSING_CHRRAW "r"
-#else
-#define PARSING_OPTRAW ,
-#define PARSING_CHRRAW ""
 #endif
-#define PARSING_OPTIONS {\
-{"import",      optional_argument, 0,'c'},\
-{"classify",    no_argument,       0,'d'},\
-{"export",      optional_argument, 0,'x'},\
-\
-{"setauthor",   required_argument, 0,'a'},\
-{"backup",      optional_argument, 0,'b'},\
-{"force",       no_argument,       0,'f'},\
-{"cgi",         no_argument,       0,'g'},\
-{"help",        no_argument,       0,'?'},\
-{"resource",    required_argument, 0,'s'},\
-{"compression-level",    required_argument, 0,'z'}\
-PARSING_OPTRAW\
-{"recursive",   no_argument,       0,'R'},\
-{"datfile",     required_argument, 0,'t'},\
-{"unknown",     no_argument,       0,2},\
-{"verbose",     no_argument,       0,'v'},\
-{"version",     no_argument,       0,1},\
-{0, 0, 0, 0}\
-}
-
-#define PARSING_CHARS    "z::i::c::dx::e::b::a::fgs::t::Rvh?"PARSING_CHRRAW
-
-/* Flags */
-#define import_flag      0x0001
-#define classify_flag    0x0002
-#define export_flag      0x0004
-#define backup_flag      0x0008
-#define force_flag       0x0010
-#define cgi_flag         0x0020
-#define help_flag        0x0040
-#define raw_flag         0x0080
-#define recursive_flag   0x0100
-#define verbose_flag     0x0200
-#define version_flag     0x0400
-#define unknown_flag     0x0800
-#define undef1_flag      0x1000
-#define undef2_flag      0x2000
-#define undef3_flag      0x4000
-#define undef4_flag      0x8000
-
-#define hasFlag(a) (optionflag&(a))
-#define setFlag(a) optionflag|=(a)
 
-#endif
diff --git a/PR/src/include/search.h b/PR/src/include/search.h
index be33d05..9a75beb 100644
--- a/PR/src/include/search.h
+++ b/PR/src/include/search.h
@@ -39,6 +39,7 @@ xmlparse.h: Princed Resources : xml handling functions header file
 #define _XMLSEARCH_H_
 
 /* Includes */
+#include "common.h" /* tTag */
 #include "xmlparse.h"
 #include "resources.h"
 
diff --git a/PR/src/lib/actions/classify.c b/PR/src/lib/actions/classify.c
index e4e345d..4a6197f 100644
--- a/PR/src/lib/actions/classify.c
+++ b/PR/src/lib/actions/classify.c
@@ -36,7 +36,7 @@ tasks.c: Princed Resources : Classify a DAT file
 #include "memory.h"
 #include "resources.h"
 #include "dat.h"
-#include "pr.h"
+#include "common.h"
 
 /***************************************************************\
 |                    Get the type of a DAT file                 |
@@ -46,7 +46,7 @@ extern int pop1;
 
 #define READ_ERROR {mReadCloseDatFile();return 0;}
 
-int prVerifyDatType(const char* vFiledat) {
+int prClassifyDat(const char* vFiledat) {
 	int                indexNumber;
 	long int           id;
 	unsigned char*     data;
diff --git a/PR/src/lib/actions/export.c b/PR/src/lib/actions/export.c
index a99f5ba..52b54e0 100644
--- a/PR/src/lib/actions/export.c
+++ b/PR/src/lib/actions/export.c
@@ -35,7 +35,7 @@ extract.c: Princed Resources : DAT Extractor
 
 #include <stdio.h>
 #include <string.h>
-#include "pr.h"
+#include "common.h"
 
 #include "export.h"
 #include "dat.h"
diff --git a/PR/src/lib/actions/import.c b/PR/src/lib/actions/import.c
index 7b3f5a5..b5401a9 100644
--- a/PR/src/lib/actions/import.c
+++ b/PR/src/lib/actions/import.c
@@ -36,7 +36,7 @@ compile.c: Princed Resources : DAT Compiler
 \***************************************************************/
 
 #include <string.h>
-#include "pr.h"
+#include "common.h"
 #include "import.h"
 
 #include "dat.h"
diff --git a/PR/src/lib/formats/bmp.c b/PR/src/lib/formats/bmp.c
index 530c0a6..2cbcbd2 100644
--- a/PR/src/lib/formats/bmp.c
+++ b/PR/src/lib/formats/bmp.c
@@ -35,7 +35,7 @@ bmp.c: Princed Resources : BMP file support
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "pr.h"
+#include "common.h"
 #include "bmp.h"
 #include "disk.h"
 #include "memory.h"
diff --git a/PR/src/lib/formats/mid.c b/PR/src/lib/formats/mid.c
index 0cf5ce6..d3315ee 100644
--- a/PR/src/lib/formats/mid.c
+++ b/PR/src/lib/formats/mid.c
@@ -34,7 +34,7 @@ mid.c: Princed Resources : MIDI files support
 /* Includes */
 #include "mid.h"
 #include "disk.h"
-#include "pr.h"
+#include "common.h"
 #include "dat.h"
 #include "memory.h"
 #include <string.h>
diff --git a/PR/src/lib/formats/pal.c b/PR/src/lib/formats/pal.c
index 84dad2e..0c6e41d 100644
--- a/PR/src/lib/formats/pal.c
+++ b/PR/src/lib/formats/pal.c
@@ -36,7 +36,6 @@ pal.c: Princed Resources : JASC PAL files support
 #include <stdlib.h>
 #include <stdio.h>
 #include "pal.h"
-#include "pr.h" /* for MAX_FILENAME_SIZE */
 #include "memory.h"
 #include "disk.h"
 #include "resources.h"
diff --git a/PR/src/lib/formats/wav.c b/PR/src/lib/formats/wav.c
index ec1f985..d416add 100644
--- a/PR/src/lib/formats/wav.c
+++ b/PR/src/lib/formats/wav.c
@@ -32,7 +32,6 @@ wav.c: Princed Resources : WAV files support
 */
 
 /* Includes */
-#include "pr.h"
 #include "wav.h"
 #include "dat.h"
 #include "disk.h"
diff --git a/PR/src/lib/layers/autodetect.c b/PR/src/lib/layers/autodetect.c
index 320ad31..caf3179 100644
--- a/PR/src/lib/layers/autodetect.c
+++ b/PR/src/lib/layers/autodetect.c
@@ -39,7 +39,7 @@ resources.c: Princed Resources : Resource Handler
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "pr.h"
+#include "common.h"
 #include "xmlparse.h"
 #include "xmlsearch.h"
 #include "disk.h"
diff --git a/PR/src/lib/layers/dat.c b/PR/src/lib/layers/dat.c
index 8c4d109..b4ad547 100644
--- a/PR/src/lib/layers/dat.c
+++ b/PR/src/lib/layers/dat.c
@@ -34,9 +34,9 @@ dat.c: Princed Resources : DAT library
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "pr.h"
 
 #include "disk.h"
+#include "common.h"
 #include "dat.h"
 
 /***************************************************************\
diff --git a/PR/src/lib/layers/disk.c b/PR/src/lib/layers/disk.c
index 4881882..6d151b7 100644
--- a/PR/src/lib/layers/disk.c
+++ b/PR/src/lib/layers/disk.c
@@ -48,7 +48,7 @@ disk.c: Princed Resources : Disk Access & File handling functions
 #include <sys/stat.h>
 
 #ifndef DISK_ALLWAYS_FORCE
-#include "pr.h" /* language texts */
+#include "common.h" /* language texts */
 #include "xmlparse.h" /* equalsIgnoreCase */
 #endif
 
diff --git a/PR/src/lib/layers/idlist.c b/PR/src/lib/layers/idlist.c
index 320ad31..caf3179 100644
--- a/PR/src/lib/layers/idlist.c
+++ b/PR/src/lib/layers/idlist.c
@@ -39,7 +39,7 @@ resources.c: Princed Resources : Resource Handler
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "pr.h"
+#include "common.h"
 #include "xmlparse.h"
 #include "xmlsearch.h"
 #include "disk.h"
diff --git a/PR/src/lib/object/image/image16.c b/PR/src/lib/object/image/image16.c
index 6ae190b..f5b06b0 100644
--- a/PR/src/lib/object/image/image16.c
+++ b/PR/src/lib/object/image/image16.c
@@ -36,7 +36,6 @@ compress.c: Princed Resources : Image Compression Library
 #include <string.h>
 #include "compress.h"
 #include "memory.h"
-#include "pr.h"
 #include "disk.h" /* array2short */
 
 /* Compression level explanation:
diff --git a/PR/src/lib/object/image/image2.c b/PR/src/lib/object/image/image2.c
index 6ae190b..f5b06b0 100644
--- a/PR/src/lib/object/image/image2.c
+++ b/PR/src/lib/object/image/image2.c
@@ -36,7 +36,6 @@ compress.c: Princed Resources : Image Compression Library
 #include <string.h>
 #include "compress.h"
 #include "memory.h"
-#include "pr.h"
 #include "disk.h" /* array2short */
 
 /* Compression level explanation:
diff --git a/PR/src/lib/object/image/image256.c b/PR/src/lib/object/image/image256.c
index 6ae190b..f5b06b0 100644
--- a/PR/src/lib/object/image/image256.c
+++ b/PR/src/lib/object/image/image256.c
@@ -36,7 +36,6 @@ compress.c: Princed Resources : Image Compression Library
 #include <string.h>
 #include "compress.h"
 #include "memory.h"
-#include "pr.h"
 #include "disk.h" /* array2short */
 
 /* Compression level explanation:
diff --git a/PR/src/lib/object/image/image_common.c b/PR/src/lib/object/image/image_common.c
index 6ae190b..f5b06b0 100644
--- a/PR/src/lib/object/image/image_common.c
+++ b/PR/src/lib/object/image/image_common.c
@@ -36,7 +36,6 @@ compress.c: Princed Resources : Image Compression Library
 #include <string.h>
 #include "compress.h"
 #include "memory.h"
-#include "pr.h"
 #include "disk.h" /* array2short */
 
 /* Compression level explanation:
diff --git a/PR/src/lib/pr.c b/PR/src/lib/pr.c
index 5a2a092..f3f86e3 100644
--- a/PR/src/lib/pr.c
+++ b/PR/src/lib/pr.c
@@ -51,7 +51,7 @@ pr.c: Main source file for Princed Resources library
 #include <stdio.h>
 #include <string.h>
 
-#include "pr.h"
+#include "common.h"
 
 #include "compress.h"
 #include "dat.h" /* MAX_RES_COUNT */
diff --git a/PR/src/lib/xml/parse.c b/PR/src/lib/xml/parse.c
index 07ebb64..b311593 100644
--- a/PR/src/lib/xml/parse.c
+++ b/PR/src/lib/xml/parse.c
@@ -39,7 +39,7 @@ xmlparse.c: Princed Resources : xml parsing functions
 #include "xmlparse.h"
 #include "disk.h"
 #include "memory.h"
-#include "pr.h"
+#include "common.h"
 #include <string.h>
 #include <stdio.h> /* Included only for XML specific attribute code */
 #include <stdlib.h>
diff --git a/PR/src/lib/xml/search.c b/PR/src/lib/xml/search.c
index ce8dff5..4ba13a0 100644
--- a/PR/src/lib/xml/search.c
+++ b/PR/src/lib/xml/search.c
@@ -37,7 +37,7 @@ xmlsearch.c: Princed Resources : specific xml handling functions
 #include <stdio.h> /* only on debugging purposes */
 
 /* Includes */
-#include "pr.h"
+#include "common.h"
 #include "xmlparse.h"
 #include "resources.h"
 #include "xmlsearch.h"
diff --git a/PR/src/lib/xml/tree.c b/PR/src/lib/xml/tree.c
index 320ad31..caf3179 100644
--- a/PR/src/lib/xml/tree.c
+++ b/PR/src/lib/xml/tree.c
@@ -39,7 +39,7 @@ resources.c: Princed Resources : Resource Handler
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "pr.h"
+#include "common.h"
 #include "xmlparse.h"
 #include "xmlsearch.h"
 #include "disk.h"
diff --git a/PR/src/lib/xml/unknown.c b/PR/src/lib/xml/unknown.c
index 320ad31..caf3179 100644
--- a/PR/src/lib/xml/unknown.c
+++ b/PR/src/lib/xml/unknown.c
@@ -39,7 +39,7 @@ resources.c: Princed Resources : Resource Handler
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "pr.h"
+#include "common.h"
 #include "xmlparse.h"
 #include "xmlsearch.h"
 #include "disk.h"