git » fp-git.git » commit d9b7f10

diff --git a/PR/src/include/autodetect.h b/PR/src/include/autodetect.h
index 29c04ff..f4957d7 100644
--- a/PR/src/include/autodetect.h
+++ b/PR/src/include/autodetect.h
@@ -31,8 +31,8 @@ autodetect.h: Princed Resources : Resource automatic detection headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _AUTODETECT_H_
-#define _AUTODETECT_H_
+#ifndef _PR_AUTODETECT_H_
+#define _PR_AUTODETECT_H_
 
 /* Includes */
 #include "reslist.h" /* tResourceType */
diff --git a/PR/src/include/auxiliary.h b/PR/src/include/auxiliary.h
index 1966407..9815adf 100644
--- a/PR/src/include/auxiliary.h
+++ b/PR/src/include/auxiliary.h
@@ -30,8 +30,8 @@ auxiliary.h: Princed Resources : Memory handling & comparison prototypes
   DO NOT remove this copyright notice
 */
 
-#ifndef _AUXILIARY_H_
-#define _AUXILIARY_H_
+#ifndef _PR_AUXILIARY_H_
+#define _PR_AUXILIARY_H_
 
 #include "binary.h"
 int isA64kPalette(tBinary c);
diff --git a/PR/src/include/binary.h b/PR/src/include/binary.h
index 1425b60..e72add9 100644
--- a/PR/src/include/binary.h
+++ b/PR/src/include/binary.h
@@ -31,8 +31,8 @@ binary.h: Princed Resources : Memory handling & comparison prototypes
   DO NOT remove this copyright notice
 */
 
-#ifndef _BINARY_H_
-#define _BINARY_H_
+#ifndef _PR_BINARY_H_
+#define _PR_BINARY_H_
 
 typedef struct {
 	unsigned char* data;
diff --git a/PR/src/include/bitmap.h b/PR/src/include/bitmap.h
index d033587..8c48e8b 100644
--- a/PR/src/include/bitmap.h
+++ b/PR/src/include/bitmap.h
@@ -32,8 +32,8 @@ bmp.h: Princed Resources : BMP file support headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _BMP_H_
-#define _BMP_H_
+#ifndef _PR_BMP_H_
+#define _PR_BMP_H_
 
 #include "reslist.h" /* tResource */
 #include "image.h" /* tImage */
diff --git a/PR/src/include/bmp.h b/PR/src/include/bmp.h
index d033587..8c48e8b 100644
--- a/PR/src/include/bmp.h
+++ b/PR/src/include/bmp.h
@@ -32,8 +32,8 @@ bmp.h: Princed Resources : BMP file support headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _BMP_H_
-#define _BMP_H_
+#ifndef _PR_BMP_H_
+#define _PR_BMP_H_
 
 #include "reslist.h" /* tResource */
 #include "image.h" /* tImage */
diff --git a/PR/src/include/classify.h b/PR/src/include/classify.h
index 6584bc1..0b727f3 100644
--- a/PR/src/include/classify.h
+++ b/PR/src/include/classify.h
@@ -31,8 +31,8 @@ classify.h: Princed Resources : DAT file classify routine headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _CLASSIFY_H_
-#define _CLASSIFY_H_
+#ifndef _PR_CLASSIFY_H_
+#define _PR_CLASSIFY_H_
 
 /*
  * Return values may be:
diff --git a/PR/src/include/common.h b/PR/src/include/common.h
index 1f4dcb1..7bfcaa6 100644
--- a/PR/src/include/common.h
+++ b/PR/src/include/common.h
@@ -36,8 +36,8 @@ common.h: Princed Resources : Defines and prototypes common to all PR code
   DO NOT remove this copyright notice
 */
 
-#ifndef _COMMON_H_
-#define _COMMON_H_
+#ifndef _PR_COMMON_H_
+#define _PR_COMMON_H_
 
 /***************************************************************\
 |                Princed Resource Library Functions             |
@@ -65,7 +65,7 @@ common.h: Princed Resources : Defines and prototypes common to all PR code
 \***************************************************************/
 
 #define PR_URL                    "http://www.princed.com.ar"
-#define PR_VERSION                "v1.2-dev"
+#define PR_VERSION                "v1.2-beta-BlackChar"
 #define PR_COPY                   "(c) Copyright 2003-2006 Princed Development Team"
 
 /***************************************************************\
diff --git a/PR/src/include/compress.h b/PR/src/include/compress.h
index 8ca70cf..2fc407b 100644
--- a/PR/src/include/compress.h
+++ b/PR/src/include/compress.h
@@ -31,8 +31,8 @@ compress.h: Princed Resources : Compression headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _COMPRESS_H_
-#define _COMPRESS_H_
+#ifndef _PR_COMPRESS_H_
+#define _PR_COMPRESS_H_
 
 #include "common.h"
 
diff --git a/PR/src/include/dat.h b/PR/src/include/dat.h
index aba356d..b83769b 100644
--- a/PR/src/include/dat.h
+++ b/PR/src/include/dat.h
@@ -31,8 +31,8 @@ dat.h: Princed Resources : DAT format library headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _DAT_H_
-#define _DAT_H_
+#ifndef _PR_DAT_H_
+#define _PR_DAT_H_
 
 #include "reslist.h" /* tResource* */
 #include "binary.h" /* tBinary */
diff --git a/PR/src/include/disk.h b/PR/src/include/disk.h
index c0be71f..e9773e9 100644
--- a/PR/src/include/disk.h
+++ b/PR/src/include/disk.h
@@ -36,8 +36,8 @@ disk.h: Princed Resources : Disk Access & File handling prototypes
   DO NOT remove this copyright notice
 */
 
-#ifndef _DISK_H_
-#define _DISK_H_
+#ifndef _PR_DISK_H_
+#define _PR_DISK_H_
 
 #include <stdio.h>
 
diff --git a/PR/src/include/export.h b/PR/src/include/export.h
index bd73d9d..13e0e61 100644
--- a/PR/src/include/export.h
+++ b/PR/src/include/export.h
@@ -31,8 +31,8 @@ export.h: Princed Resources : DAT extraction prototypes
   DO NOT remove this copyright notice
 */
 
-#ifndef _EXPORT_H_
-#define _EXPORT_H_
+#ifndef _PR_EXPORT_H_
+#define _PR_EXPORT_H_
 
 #include "reslist.h"
 
diff --git a/PR/src/include/filedir.h b/PR/src/include/filedir.h
index e5ae6ad..f705fef 100644
--- a/PR/src/include/filedir.h
+++ b/PR/src/include/filedir.h
@@ -35,8 +35,8 @@ filedir.h: Princed Resources : File list layer for console IDE prototypes
 |                  I M P L E M E N T A T I O N                  |
 \***************************************************************/
 
-#ifndef _FILEDIR_H_
-#define _FILEDIR_H_
+#ifndef _PR_FILEDIR_H_
+#define _PR_FILEDIR_H_
 
 /* types */
 typedef struct tFileDir {
diff --git a/PR/src/include/idlist.h b/PR/src/include/idlist.h
index b5cfbd7..7d4c4d5 100644
--- a/PR/src/include/idlist.h
+++ b/PR/src/include/idlist.h
@@ -31,8 +31,8 @@ idlist.h: Princed Resources : Resource id list headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _IDLIST_H_
-#define _IDLIST_H_
+#ifndef _PR_IDLIST_H_
+#define _PR_IDLIST_H_
 
 /* Includes */
 #include "reslist.h" /* tResourceId */
diff --git a/PR/src/include/image.h b/PR/src/include/image.h
index 4bd17e1..3c337fb 100644
--- a/PR/src/include/image.h
+++ b/PR/src/include/image.h
@@ -31,8 +31,8 @@ image.h: Princed Resources : Image handling headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _IMAGE_H_
-#define _IMAGE_H_
+#ifndef _PR_IMAGE_H_
+#define _PR_IMAGE_H_
 
 #include "reslist.h"
 #include "binary.h"
diff --git a/PR/src/include/import.h b/PR/src/include/import.h
index 16f049f..93c275f 100644
--- a/PR/src/include/import.h
+++ b/PR/src/include/import.h
@@ -31,8 +31,8 @@ import.h: Princed Resources : DAT importation prototypes
   DO NOT remove this copyright notice
 */
 
-#ifndef _IMPORT_H_
-#define _IMPORT_H_
+#ifndef _PR_IMPORT_H_
+#define _PR_IMPORT_H_
 
 #include "reslist.h"
 
diff --git a/PR/src/include/list.h b/PR/src/include/list.h
index a7be6c6..7ecdb61 100644
--- a/PR/src/include/list.h
+++ b/PR/src/include/list.h
@@ -32,8 +32,8 @@ list.h: Princed Resources : Ordered Read-Only list headers
 */
 
 /* Defines */
-#ifndef _LIST_H_
-#define _LIST_H_
+#ifndef _PR_LIST_H_
+#define _PR_LIST_H_
 
 #define GT 1
 #define EQ 0
diff --git a/PR/src/include/memory.h b/PR/src/include/memory.h
index 8876494..4522aeb 100644
--- a/PR/src/include/memory.h
+++ b/PR/src/include/memory.h
@@ -31,8 +31,8 @@ memory.h: Princed Resources : Memory handling & comparison prototypes
   DO NOT remove this copyright notice
 */
 
-#ifndef _MEMORY_H_
-#define _MEMORY_H_
+#ifndef _PR_MEMORY_H_
+#define _PR_MEMORY_H_
 
 #include <stdlib.h>
 
diff --git a/PR/src/include/mid.h b/PR/src/include/mid.h
index 63cde43..d2f37f1 100644
--- a/PR/src/include/mid.h
+++ b/PR/src/include/mid.h
@@ -31,8 +31,8 @@ mid.h: Princed Resources : MIDI files support headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _MID_H_
-#define _MID_H_
+#ifndef _PR_MID_H_
+#define _PR_MID_H_
 
 #include "binary.h"
 #include "reslist.h"
diff --git a/PR/src/include/object.h b/PR/src/include/object.h
index 6a6ee9f..96385e8 100644
--- a/PR/src/include/object.h
+++ b/PR/src/include/object.h
@@ -30,8 +30,8 @@ object.h: Princed Resources : Main item class types and prototypes
   DO NOT remove this copyright notice
 */
 
-#ifndef _OBJECT_H_
-#define _OBJECT_H_
+#ifndef _PR_OBJECT_H_
+#define _PR_OBJECT_H_
 
 #include "reslist.h"
 #include "common.h"
diff --git a/PR/src/include/other.h b/PR/src/include/other.h
index 1512159..3108c28 100644
--- a/PR/src/include/other.h
+++ b/PR/src/include/other.h
@@ -30,8 +30,8 @@ other.h: Princed Resources :
   DO NOT remove this copyright notice
 */
 
-#ifndef _OTHER_H_
-#define _OTHER_H_
+#ifndef _PR_OTHER_H_
+#define _PR_OTHER_H_
 
 #include "binary.h"
 
diff --git a/PR/src/include/pal.h b/PR/src/include/pal.h
index dadc428..67c6930 100644
--- a/PR/src/include/pal.h
+++ b/PR/src/include/pal.h
@@ -31,8 +31,8 @@ pal.h: Princed Resources : JASC PAL files support headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _PAL_H_
-#define _PAL_H_
+#ifndef _PR_PAL_H_
+#define _PR_PAL_H_
 
 #include "image.h"
 #include "palette.h"
diff --git a/PR/src/include/palette.h b/PR/src/include/palette.h
index 7859439..870ba0c 100644
--- a/PR/src/include/palette.h
+++ b/PR/src/include/palette.h
@@ -31,8 +31,8 @@ pal.h: Princed Resources : JASC PAL files support headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _PALETTE_H_
-#define _PALETTE_H_
+#ifndef _PR_PALETTE_H_
+#define _PR_PALETTE_H_
 
 #include "image.h" /* tPalette, tImage */
 #include "binary.h"
diff --git a/PR/src/include/pallist.h b/PR/src/include/pallist.h
index f528567..9be91f4 100644
--- a/PR/src/include/pallist.h
+++ b/PR/src/include/pallist.h
@@ -31,8 +31,8 @@
   DO NOT remove this copyright notice
 */
 
-#ifndef _PALLIST_H_
-#define _PALLIST_H_
+#ifndef _PR_PALLIST_H_
+#define _PR_PALLIST_H_
 
 #include "list.h"    /* tList */
 typedef tList tPaletteList;
diff --git a/PR/src/include/parse.h b/PR/src/include/parse.h
index 2571ce8..8395f9c 100644
--- a/PR/src/include/parse.h
+++ b/PR/src/include/parse.h
@@ -31,8 +31,8 @@ parse.h: Princed Resources : XML parsing prototypes
   DO NOT remove this copyright notice
 */
 
-#ifndef _PARSE_H_
-#define _PARSE_H_
+#ifndef _PR_PARSE_H_
+#define _PR_PARSE_H_
 
 #include "pr.h"
 const char* getExtDesc(int type);
diff --git a/PR/src/include/plv.h b/PR/src/include/plv.h
index e507ff5..6248a4a 100644
--- a/PR/src/include/plv.h
+++ b/PR/src/include/plv.h
@@ -39,8 +39,8 @@ plv.h: Princed Resources : PLV prince level files support headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _PLV_H_
-#define _PLV_H_
+#ifndef _PR_PLV_H_
+#define _PR_PLV_H_
 
 /*
  * PLV 1 SPECS:
diff --git a/PR/src/include/png.h b/PR/src/include/png.h
index d033587..8c48e8b 100644
--- a/PR/src/include/png.h
+++ b/PR/src/include/png.h
@@ -32,8 +32,8 @@ bmp.h: Princed Resources : BMP file support headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _BMP_H_
-#define _BMP_H_
+#ifndef _PR_BMP_H_
+#define _PR_BMP_H_
 
 #include "reslist.h" /* tResource */
 #include "image.h" /* tImage */
diff --git a/PR/src/include/pr.h b/PR/src/include/pr.h
index 3a470a1..01fe19a 100644
--- a/PR/src/include/pr.h
+++ b/PR/src/include/pr.h
@@ -39,8 +39,8 @@ pr.h: Princed Resources : Main library header prototypes and definitions
   DO NOT remove this copyright notice
 */
 
-#ifndef _PR_H_
-#define _PR_H_
+#ifndef _PR_PR_H_
+#define _PR_PR_H_
 
 /* types */
 typedef struct tTag {
diff --git a/PR/src/include/reslist.h b/PR/src/include/reslist.h
index 4a7b14e..05570c0 100644
--- a/PR/src/include/reslist.h
+++ b/PR/src/include/reslist.h
@@ -31,8 +31,8 @@ reslist.h: Princed Resources : Resource list prototypes
   DO NOT remove this copyright notice
 */
 
-#ifndef _RESLIST_H_
-#define _RESLIST_H_
+#ifndef _PR_RESLIST_H_
+#define _PR_RESLIST_H_
 
 #include "list.h" /* tList */
 typedef tList tResourceList;
diff --git a/PR/src/include/resourcematch.h b/PR/src/include/resourcematch.h
index 5eec063..889cb0a 100644
--- a/PR/src/include/resourcematch.h
+++ b/PR/src/include/resourcematch.h
@@ -32,8 +32,8 @@ resourcematch.h: Princed Resources : Partial list matching abstract layer header
 */
 
 
-#ifndef _RESOURCEMATCH_H_
-#define _RESOURCEMATCH_H_
+#ifndef _PR_RESOURCEMATCH_H_
+#define _PR_RESOURCEMATCH_H_
 
 #include "reslist.h" /* tResourceId*/
 
diff --git a/PR/src/include/search.h b/PR/src/include/search.h
index 3aa1bc3..de2f9be 100644
--- a/PR/src/include/search.h
+++ b/PR/src/include/search.h
@@ -35,8 +35,8 @@ search.h: Princed Resources : Abstract XML tree searching prototypes
 |                  I M P L E M E N T A T I O N                  |
 \***************************************************************/
 
-#ifndef _SEARCH_H_
-#define _SEARCH_H_
+#ifndef _PR_SEARCH_H_
+#define _PR_SEARCH_H_
 
 /* Includes */
 #include "common.h" /* tTag */
diff --git a/PR/src/include/sound.h b/PR/src/include/sound.h
index f6f504e..b582349 100644
--- a/PR/src/include/sound.h
+++ b/PR/src/include/sound.h
@@ -30,8 +30,8 @@ sound.h: Princed Resources :
   DO NOT remove this copyright notice
 */
 
-#ifndef _SOUND_H_
-#define _SOUND_H_
+#ifndef _PR_SOUND_H_
+#define _PR_SOUND_H_
 
 #include "binary.h"
 #include "reslist.h"
diff --git a/PR/src/include/stringformat.h b/PR/src/include/stringformat.h
index d307c5e..5e30bad 100644
--- a/PR/src/include/stringformat.h
+++ b/PR/src/include/stringformat.h
@@ -31,8 +31,8 @@ stringformat.h: Princed Resources : Format string parsing header
   DO NOT remove this copyright notice
 */
 
-#ifndef _STRINGFORMAT_H_
-#define _STRINGFORMAT_H_
+#ifndef _PR_STRINGFORMAT_H_
+#define _PR_STRINGFORMAT_H_
 
 #define isNumber(k) ('0'<=(k) && (k)<='9')
 
diff --git a/PR/src/include/translate.h b/PR/src/include/translate.h
index 6c314ba..d45e6f2 100644
--- a/PR/src/include/translate.h
+++ b/PR/src/include/translate.h
@@ -31,8 +31,8 @@ translate.h: Princed Resources : Array translating resources prototypes
   DO NOT remove this copyright notice
 */
 
-#ifndef _TRANSLATE_H_
-#define _TRANSLATE_H_
+#ifndef _PR_TRANSLATE_H_
+#define _PR_TRANSLATE_H_
 
 #define TRANS_ARRAY_INDEX_INT {\
 	"pop1", "cust", "fram", "palc", "pals", "palt", "piec", "scr", "shap", "shpl", "strl", "snd", "seqs", "txt4"}
diff --git a/PR/src/include/tree.h b/PR/src/include/tree.h
index 787f661..4814483 100644
--- a/PR/src/include/tree.h
+++ b/PR/src/include/tree.h
@@ -31,8 +31,8 @@ tree.h: Princed Resources : Special XML tree prototypes
   DO NOT remove this copyright notice
 */
 
-#ifndef _TREE_H_
-#define _TREE_H_
+#ifndef _PR_TREE_H_
+#define _PR_TREE_H_
 
 /* Includes */
 #include "reslist.h"
diff --git a/PR/src/include/types.h b/PR/src/include/types.h
index 4a7b14e..05570c0 100644
--- a/PR/src/include/types.h
+++ b/PR/src/include/types.h
@@ -31,8 +31,8 @@ reslist.h: Princed Resources : Resource list prototypes
   DO NOT remove this copyright notice
 */
 
-#ifndef _RESLIST_H_
-#define _RESLIST_H_
+#ifndef _PR_RESLIST_H_
+#define _PR_RESLIST_H_
 
 #include "list.h" /* tList */
 typedef tList tResourceList;
diff --git a/PR/src/include/unknown.h b/PR/src/include/unknown.h
index 4b5845b..fb3b1fe 100644
--- a/PR/src/include/unknown.h
+++ b/PR/src/include/unknown.h
@@ -31,8 +31,8 @@ unknown.h: Princed Resources : Unknown.xml generator headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _UNKNOWN_H_
-#define _UNKNOWN_H_
+#ifndef _PR_UNKNOWN_H_
+#define _PR_UNKNOWN_H_
 
 /* Note:
  * To use the functions as a library you must include pr.h
diff --git a/PR/src/include/wav.h b/PR/src/include/wav.h
index aecee0e..b78912d 100644
--- a/PR/src/include/wav.h
+++ b/PR/src/include/wav.h
@@ -31,8 +31,8 @@ wav.h: Princed Resources : WAV files support headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _WAV_H_
-#define _WAV_H_
+#ifndef _PR_WAV_H_
+#define _PR_WAV_H_
 
 #include "binary.h"
 #include "reslist.h"