Commit Diff

Commit:
1f098efb7370a0b28306d10681e21883fb1c1507
From:
Russ Cox <rsc@swtch.com>
Date:
Message:
all: a few more #define tricks for AIX This should make the AIX build finally work. Fixes #400.
Actions:
Patch | Tree
commit - d32deab17bfffa5bffc5fab3e6577558e40888c5
commit + 1f098efb7370a0b28306d10681e21883fb1c1507
blob - c11163ef05895ef0bd65b673dad0e4cbe1fab2c1
blob + aae39b4a44041ef8be8cd01728f55679af02ea23
--- src/cmd/sam/sam.h
+++ src/cmd/sam/sam.h
@@ -9,6 +9,9 @@
 #undef warn
 #define warn samwarn
 
+#undef class
+#define class samclass
+
 /*
  * BLOCKSIZE is relatively small to keep memory consumption down.
  */
blob - bf5ebc9fe7016ed478385d2f492e9de5a76e4f5d
blob + dc30aeedd4cae2efaff53d144ee3c1746f145701
--- src/libdiskfs/hfs.h
+++ src/libdiskfs/hfs.h
@@ -75,6 +75,39 @@ enum
 	/* catalog record types */
 	Folder = 1, File, FolderThread, FileThread,
 
+	/* some systems have these defined */
+	#undef IEXEC
+	#undef IWRITE
+	#undef IREAD
+	#undef ISVTX
+	#undef ISGID
+	#undef ISUID
+	#undef IFMT
+	#undef IFIFO
+	#undef IFCHR
+	#undef IFDIR
+	#undef IFBLK
+	#undef IFREG
+	#undef IFLNK
+	#undef IFSOCK
+	#undef IFWHT
+
+	#define IEXEC	HFS_IEXEC
+	#define IWRITE	HFS_IWRITE
+	#define IREAD	HFS_IREAD
+	#define ISVTX	HFS_ISVTX
+	#define ISGID	HFS_ISGID
+	#define ISUID	HFS_ISUID
+	#define IFMT	HFS_IFMT
+	#define IFIFO	HFS_IFIFO
+	#define IFCHR	HFS_IFCHR
+	#define IFDIR	HFS_IFDIR
+	#define IFBLK	HFS_IFBLK
+	#define IFREG	HFS_IFREG
+	#define IFLNK	HFS_IFLNK
+	#define IFSOCK	HFS_IFSOCK
+	#define IFWHT	HFS_IFWHT
+
 	/* permissions in Inode.mode */
 	IEXEC = 00100,
 	IWRITE = 0200,