Module Name: src
Committed By: jakllsch
Date: Sun Aug 7 20:05:08 UTC 2011
Modified Files:
src/sys/dev/ic: hscx.h ipac.h isac.h
Log Message:
Appease _LP64 build with GCC 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/hscx.h src/sys/dev/ic/ipac.h \
src/sys/dev/ic/isac.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/hscx.h
diff -u src/sys/dev/ic/hscx.h:1.3 src/sys/dev/ic/hscx.h:1.4
--- src/sys/dev/ic/hscx.h:1.3 Sun Dec 11 12:21:26 2005
+++ src/sys/dev/ic/hscx.h Sun Aug 7 20:05:08 2011
@@ -30,7 +30,7 @@
*
*---------------------------------------------------------------------------
*
- * $Id: hscx.h,v 1.3 2005/12/11 12:21:26 christos Exp $
+ * $Id: hscx.h,v 1.4 2011/08/07 20:05:08 jakllsch Exp $
*
* last edit-date: [Sun Feb 14 10:26:56 1999]
*
@@ -119,7 +119,7 @@
} hscx_rw;
} hscx_reg_t;
-#define REG_OFFSET(type, field) (int)(&(((type *)0)->field))
+#define REG_OFFSET(type, field) (uintptr_t)(&(((type *)0)->field))
/* HSCX read registers */
Index: src/sys/dev/ic/ipac.h
diff -u src/sys/dev/ic/ipac.h:1.3 src/sys/dev/ic/ipac.h:1.4
--- src/sys/dev/ic/ipac.h:1.3 Sun Dec 11 12:21:27 2005
+++ src/sys/dev/ic/ipac.h Sun Aug 7 20:05:08 2011
@@ -27,7 +27,7 @@
* i4b_ipac.h - definitions for the Siemens IPAC PSB2115 chip
* ==========================================================
*
- * $Id: ipac.h,v 1.3 2005/12/11 12:21:27 christos Exp $
+ * $Id: ipac.h,v 1.4 2011/08/07 20:05:08 jakllsch Exp $
*
* last edit-date: [Thu Jan 6 14:54:19 2000]
*
@@ -92,7 +92,7 @@
} ipac_rw;
} ipac_reg_t;
-#define REG_OFFSET(type, field) (int)(&(((type *)0)->field))
+#define REG_OFFSET(type, field) (uintptr_t)(&(((type *)0)->field))
/* IPAC read registers */
Index: src/sys/dev/ic/isac.h
diff -u src/sys/dev/ic/isac.h:1.3 src/sys/dev/ic/isac.h:1.4
--- src/sys/dev/ic/isac.h:1.3 Sun Dec 11 12:21:27 2005
+++ src/sys/dev/ic/isac.h Sun Aug 7 20:05:08 2011
@@ -30,7 +30,7 @@
*
*---------------------------------------------------------------------------
*
- * $Id: isac.h,v 1.3 2005/12/11 12:21:27 christos Exp $
+ * $Id: isac.h,v 1.4 2011/08/07 20:05:08 jakllsch Exp $
*
* last edit-date: [Sun Feb 14 10:27:13 1999]
*
@@ -144,7 +144,7 @@
} isac_rw;
} isac_reg_t;
-#define REG_OFFSET(type, field) (int)(&(((type *)0)->field))
+#define REG_OFFSET(type, field) (uintptr_t)(&(((type *)0)->field))
/* ISAC read registers */
