git » fp-git.git » commit d65c488

diff --git a/FP/src/include/disk.h b/FP/src/include/disk.h
index 12ad8ef..59204c2 100644
--- a/FP/src/include/disk.h
+++ b/FP/src/include/disk.h
@@ -41,13 +41,16 @@ disk.h: Princed Resources : Disk Access & File handling functions headers
 
 #include <stdio.h>
 
+/* #define DISK_DIR_SCANING         */
+/* #define DISK_TERM_MANIPULATION   */
+#define DISK_ALLWAYS_FORCE
+
 /* 64 Kb */
 #define SIZE_OF_FILE     256*1024
 #define MAX_FILENAME_SIZE        260
 
 #define DIR_SEPARATOR '/'
 
-
 typedef enum {eFile,eDirectory,eNotFound}whatIs;
 
 #define charToUpper(a) ((a)&0xDF)
@@ -76,16 +79,31 @@ const char* getFileNameFromPath(const char* path);
 whatIs isDir(const char *nombre);
 #define mRemoveFile(a) remove(repairFolders(a))
 
+#ifdef DISK_DIR_SCANING
+int recurseDirectory(const char* path,int recursive, void* pass, void (*function)(const char*,void*));
+#endif
+
 /* array2vars*/
 
 #define array2short(a) ((*(a)))+((*((a)+1))<<8)
 #define array2long(a)  ((*(a)))+((*((a)+1))<<8)+((*((a)+2))<<16)+((*((a)+3))<<24)
 
+#ifdef MACOS
+#define freadshort(var,file)  macfreads ((var),file)
+#define freadlong(var,file)   macfreadl ((var),file)
+#define fwriteshort(var,file) macfwrites((var),file)
+#define fwritelong(var,file)  macfwritel((var),file)
+#define fwritechar(var,file)  fwrite((var),1,1,file)
+int macfreads (void* bigEndian,FILE* file);
+int macfreadl (void* var,FILE* file);
+int macfwrites(const void* var,FILE* file);
+int macfwritel(const void* var,FILE* file);
+#else
 #define freadshort(var,file)  fread ((var),2,1,file)
 #define freadlong(var,file)   fread ((var),4,1,file)
 #define fwriteshort(var,file) fwrite((var),2,1,file)
 #define fwritelong(var,file)  fwrite((var),4,1,file)
 #define fwritechar(var,file)  fwrite((var),1,1,file)
-
 #endif
 
+#endif
diff --git a/FP/src/res/disk.c b/FP/src/res/disk.c
index 947785b..c412696 100644
--- a/FP/src/res/disk.c
+++ b/FP/src/res/disk.c
@@ -47,10 +47,6 @@ disk.c: Princed Resources : Disk Access & File handling functions
 #include <sys/types.h>
 #include <sys/stat.h>
 
-/* #define DISK_DIR_SCANING         */
-/* #define DISK_TERM_MANIPULATION   */
-#define DISK_ALLWAYS_FORCE
-
 #ifndef DISK_ALLWAYS_FORCE
 #include "pr.h" /* language texts */
 #include "xmlparse.h" /* equalsIgnoreCase */
diff --git a/PR/src/include/disk.h b/PR/src/include/disk.h
index d774f32..071f3c1 100644
--- a/PR/src/include/disk.h
+++ b/PR/src/include/disk.h
@@ -41,8 +41,15 @@ disk.h: Princed Resources : Disk Access & File handling functions headers
 
 #include <stdio.h>
 
+#define DISK_DIR_SCANING
+#define DISK_TERM_MANIPULATION
+/* #define DISK_ALLWAYS_FORCE   */
+
 /* 64 Kb */
 #define SIZE_OF_FILE     256*1024
+#define MAX_FILENAME_SIZE        260
+
+#define DIR_SEPARATOR '/'
 
 typedef enum {eFile,eDirectory,eNotFound}whatIs;
 
@@ -69,11 +76,13 @@ int  mLoadFileArray(const char* vFile,unsigned char** array);
 int  makebase      (const char* p);
 const char* repairFolders(const char* a);
 const char* getFileNameFromPath(const char* path);
-int recurseDirectory(const char* path,int recursive, void* pass, void (*function)(const char*,void*));
 whatIs isDir(const char *nombre);
-int mCopy(const char* strSource, const char* strTarget);
 #define mRemoveFile(a) remove(repairFolders(a))
 
+#ifdef DISK_DIR_SCANING
+int recurseDirectory(const char* path,int recursive, void* pass, void (*function)(const char*,void*));
+#endif
+
 /* array2vars*/
 
 #define array2short(a) ((*(a)))+((*((a)+1))<<8)
@@ -98,4 +107,3 @@ int macfwritel(const void* var,FILE* file);
 #endif
 
 #endif
-
diff --git a/PR/src/lib/layers/disk.c b/PR/src/lib/layers/disk.c
index f5ff968..c412696 100644
--- a/PR/src/lib/layers/disk.c
+++ b/PR/src/lib/layers/disk.c
@@ -47,10 +47,6 @@ disk.c: Princed Resources : Disk Access & File handling functions
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#define DISK_DIR_SCANING
-#define DISK_TERM_MANIPULATION
-/* #define DISK_ALLWAYS_FORCE   */
-
 #ifndef DISK_ALLWAYS_FORCE
 #include "pr.h" /* language texts */
 #include "xmlparse.h" /* equalsIgnoreCase */