mirror of
https://github.com/RTimothyEdwards/magic.git
synced 2026-09-01 10:39:43 +02:00
MacOS: FREAD rename to magicFREAD due to sys/fcntl.h definition
Example build issue using MacOS 12 (Xcode 14.2 from MacOSX.platform).
In file included from grTk1.c:23:
In file included from ../utils/main.h:26:
In file included from ../windows/windows.h:26:
../utils/magic.h:143:13: warning: 'FREAD' macro redefined [-Wmacro-redefined]
#define FREAD(a,b,c,d) gzread(d,a,b*c)
^
/Applications/Xcode_14.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/sys/fcntl.h:110:9: note: previous definition is here
#define FREAD 0x00000001
This commit is contained in:
committed by
Tim Edwards
parent
48f8707753
commit
bfc82e43db
+2
-2
@@ -146,7 +146,7 @@ extern char AbortMessage[];
|
||||
#define FOPEN gzopen
|
||||
#define FCLOSE gzclose
|
||||
#define FGETC gzgetc
|
||||
#define FREAD(a,b,c,d) gzread(d,a,b*c)
|
||||
#define magicFREAD(a,b,c,d) gzread(d,a,b*c)
|
||||
#define FEOF gzeof
|
||||
#define FSEEK gzseek
|
||||
#define FTELL gztell
|
||||
@@ -157,7 +157,7 @@ extern char AbortMessage[];
|
||||
#define FOPEN fopen
|
||||
#define FCLOSE fclose
|
||||
#define FGETC getc
|
||||
#define FREAD fread
|
||||
#define magicFREAD fread
|
||||
#define FEOF feof
|
||||
#define FSEEK fseek
|
||||
#define FTELL ftello
|
||||
|
||||
Reference in New Issue
Block a user