Jelajahi Sumber

reverted back changes of the dnix headers so that they are untainted. Fixed by define juggling in main code.

Mattis Lind 5 tahun lalu
induk
melakukan
2de492924a
2 mengubah file dengan 11 tambahan dan 3 penghapusan
  1. 1 1
      dnix-headers/diskpar.h
  2. 10 2
      dnix-traverse/dnix-traverse.cpp

+ 1 - 1
dnix-headers/diskpar.h

@@ -37,7 +37,7 @@ struct sysfptr {
 	daddr_t	vdsp;		/* Pointer to volume descriptor block */
 	daddr_t	vdspn;		/* 1:s complement of previous item */
 	daddr_t	cleanfl;	/* Volume clean flag */
-	dnix_time_t	timestamp;	/* Timestamp */
+	time_t	timestamp;	/* Timestamp */
 	daddr_t	x[124];		/* Reserved */
 };
 

+ 10 - 2
dnix-traverse/dnix-traverse.cpp

@@ -12,16 +12,24 @@
 #include <stdio.h>
 #include <time.h>
 
-typedef unsigned int daddr_t;
-typedef unsigned int dnix_time_t;
+typedef unsigned int dnix_daddr_t;
+typedef int dnix_time_t;
 
 #pragma pack(1)
 
+#define daddr_t dnix_daddr_t
+#define time_t dnix_time_t
+
 #include "../dnix-headers/diskpar.h"
 #include "../dnix-headers/inode.h"
 #include "../dnix-headers/sysfile.h"
 #include "../dnix-headers/dir.h"
 
+#undef daddr_t
+#undef time_t
+#define daddr_t daddr_t
+#define time_t time_t
+
 
 #define swap32(num) (((num>>24)&0xff) | ((num<<8)&0xff0000) | ((num>>8)&0xff00) | ((num<<24)&0xff000000))