diff options
| author | Stef Walter <stef@thewalter.net> | 2004-04-03 23:00:48 +0000 |
|---|---|---|
| committer | Stef Walter <stef@thewalter.net> | 2004-04-03 23:00:48 +0000 |
| commit | abcb5c9321f31df3f84f0b07bfe61bbd1d594042 (patch) | |
| tree | 6dfcc8e90999009864157ceefb6e01cae2f2cf1f | |
| parent | 19db12ca3a427cddc91bb1f5a0b62cc72baf3a15 (diff) | |
Fixes for windows.
| -rw-r--r-- | src/drive.h | 2 | ||||
| -rw-r--r-- | src/ntfsx.c | 2 | ||||
| -rw-r--r-- | src/scrounge.c | 2 | ||||
| -rw-r--r-- | src/usuals.h | 10 |
4 files changed, 11 insertions, 5 deletions
diff --git a/src/drive.h b/src/drive.h index fdfc0eb..9d8e58c 100644 --- a/src/drive.h +++ b/src/drive.h @@ -23,7 +23,7 @@ #include "usuals.h" #define kSectorSize 0x200 -#define kInvalidSector 0xFFFFFFFFFFFFFFFFLL +#define kInvalidSector UL(0xFFFFFFFFFFFFFFFF) struct _ntfsx_mftmap; struct _drivelocks; diff --git a/src/ntfsx.c b/src/ntfsx.c index 35f1c23..4d6546b 100644 --- a/src/ntfsx.c +++ b/src/ntfsx.c @@ -316,7 +316,7 @@ ntfsx_attribute* ntfsx_record_findattribute(ntfsx_record* record, uint32 attrTyp if(atlr->type == attrType) { /* Read in appropriate cluster */ - mftRecord = ntfsx_mftmap_sectorforindex(record->info->mftmap, atlr->refAttrib & 0xFFFFFFFFFFFFLL); + mftRecord = ntfsx_mftmap_sectorforindex(record->info->mftmap, atlr->refAttrib & UL(0xFFFFFFFFFFFF)); r2 = ntfsx_record_alloc(record->info); if(!r2) diff --git a/src/scrounge.c b/src/scrounge.c index 4b4851c..075f329 100644 --- a/src/scrounge.c +++ b/src/scrounge.c @@ -109,7 +109,7 @@ void processRecordFileBasics(partitioninfo* pi, ntfsx_record* record, filebasics /* Parent Directory */ - basics->parent = filename->refParent & 0xFFFFFFFFFFFFLL; + basics->parent = filename->refParent & UL(0xFFFFFFFFFFFF); /* Namespace */ diff --git a/src/usuals.h b/src/usuals.h index 038e8f9..f429d5b 100644 --- a/src/usuals.h +++ b/src/usuals.h @@ -23,9 +23,9 @@ #include <sys/types.h> #ifdef _WIN32 - #include <../config.win32.h> + #include "config.win32.h" #else - #include <../config.h> + #include "config.h" #endif #ifdef HAVE_IO_H @@ -72,4 +72,10 @@ #define min(a,b) (((a) < (b)) ? (a) : (b)) #endif +#ifdef _WIN32 + #define UL(x) x +#else + #define UL(x) x#LL +#endif + #endif /* __USUALS_H__ */ |