20070407-1047 offsetof changes

2 files changed, 1 insertions, 8 deletions

diff --git a/os/port/devftl.c b/os/port/devftl.c
index ab24588a..c0ea2816 100644
--- a/os/port/devftl.c
+++ b/os/port/devftl.c
@@ -32,10 +32,6 @@
 
 #include "kernel.h"
 
-#ifndef offsetof
-#define	offsetof(s, m)	(ulong)(&(((s*)0)->m))
-#endif
-
 typedef struct Ftl Ftl;
 typedef struct Merase Merase;
 typedef struct Terase Terase;
diff --git a/os/port/devlogfs.c b/os/port/devlogfs.c
index 630d3eba..9f892e1a 100755
--- a/os/port/devlogfs.c
+++ b/os/port/devlogfs.c
@@ -2,6 +2,7 @@
 #include "u.h"
 #include "../port/lib.h"
 #include "../port/error.h"
+#include "mem.h"
 #else
 #include	"error.h"
 #endif
@@ -16,10 +17,6 @@
 #define Wakeup wakeup
 #endif
 
-#ifndef offsetof
-#define offsetof(T,X) ((ulong)&(((T*)0)->X))
-#endif
-
 typedef struct Devlogfs Devlogfs;
 typedef struct DevlogfsSession DevlogfsSession;