Index: ahd_pci.c
===================================================================
RCS file: /repoman/r/ncvs/src/sys/dev/aic7xxx/ahd_pci.c,v
retrieving revision 1.4
diff -u -r1.4 ahd_pci.c
--- ahd_pci.c	16 Oct 2002 02:59:03 -0000	1.4
+++ ahd_pci.c	4 Nov 2002 12:52:13 -0000
@@ -33,6 +33,9 @@
  * $FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.4 2002/10/16 02:59:03 gibbs Exp $
  */
 
+#include <sys/types.h>
+#include <machine/bus.h>
+
 #include <dev/aic7xxx/aic79xx_osm.h>
 
 #define	AHD_PCI_IOADDR0 PCIR_MAPS	/* Primary I/O BAR */
Index: aic79xx.c
===================================================================
RCS file: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic79xx.c,v
retrieving revision 1.4
diff -u -r1.4 aic79xx.c
--- aic79xx.c	26 Sep 2002 22:53:59 -0000	1.4
+++ aic79xx.c	11 Nov 2002 02:29:04 -0000
@@ -46,10 +46,12 @@
 #include "aic79xx_osm.h"
 #include "aic79xx_inline.h"
 #include "aicasm/aicasm_insformat.h"
+#define	SIZE_T_MODIFIER ""
 #else
 #include <dev/aic7xxx/aic79xx_osm.h>
 #include <dev/aic7xxx/aic79xx_inline.h>
 #include <dev/aic7xxx/aicasm/aicasm_insformat.h>
+#define	SIZE_T_MODIFIER "j"
 #endif
 
 /******************************** Globals *************************************/
@@ -4203,8 +4205,8 @@
 	}
 #ifdef AHD_DEBUG
 	if ((ahd_debug & AHD_SHOW_MEMORY) != 0) {
-		printf("%s: scb size = 0x%x, hscb size - 0x%x\n",
-		       ahd_name(ahd), sizeof(struct scb),
+		printf("%s: scb size = 0x%"SIZE_T_MODIFIER"x, "
+		      "hscb size - 0x%zx\n", ahd_name(ahd), sizeof(struct scb),
 		       sizeof(struct hardware_scb));
 	}
 #endif
@@ -4597,8 +4599,8 @@
 	}
 #ifdef AHD_DEBUG
 	if ((ahd_debug & AHD_SHOW_MEMORY) != 0)
-		printf("%s: ahd_sglist_allocsize = 0x%x\n", ahd_name(ahd),
-		       ahd_sglist_allocsize(ahd));
+		printf("%s: ahd_sglist_allocsize = 0x%llx\n", ahd_name(ahd),
+		       (long long)ahd_sglist_allocsize(ahd));
 #endif
 
 	scb_data->init_level++;
Index: aic79xx_osm.c
===================================================================
RCS file: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic79xx_osm.c,v
retrieving revision 1.3
diff -u -r1.3 aic79xx_osm.c
--- aic79xx_osm.c	31 Aug 2002 06:51:15 -0000	1.3
+++ aic79xx_osm.c	4 Nov 2002 13:11:18 -0000
@@ -34,6 +34,8 @@
  * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.3 2002/08/31 06:51:15 gibbs Exp $
  */
 
+#include <sys/stdint.h>
+
 #include <dev/aic7xxx/aic79xx_osm.h>
 #include <dev/aic7xxx/aic79xx_inline.h>
 
@@ -1927,7 +1929,7 @@
 	if (count <= 0)
 		count = 1;
 	while (--count >= 0) {
-		db_printf("%04x (M)%x: \t", addr,
+		db_printf("%04jx (M)%x: \t", (intmax_t)addr,
 			  ahd_inb(ahd_ddb_softc, MODE_PTR));
 		switch (size) {
 		case 1:
@@ -1986,9 +1988,9 @@
 			ahd_outl(ahd_ddb_softc, addr, new_value);
 			break;
 		}
-		db_printf("%04x (M)%x: \t0x%x\t=\t0x%x",
-			  addr, ahd_inb(ahd_ddb_softc, MODE_PTR),
-			  old_value, new_value);
+		db_printf("%04jx (M)%x: \t0x%jx\t=\t0x%jx",
+			  (intmax_t)addr, ahd_inb(ahd_ddb_softc, MODE_PTR),
+			  (intmax_t)old_value, (intmax_t)new_value);
 		addr += size;
 	}
 	db_skip_to_eol();