PERFORCE change 108372 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=108372

Change 108372 by marcel at marcel_cluster on 2006/10/24 23:29:56

	i386 build fixes.

Affected files ...

.. //depot/projects/ia64/sys/boot/efi/include/i386/efibind.h#4 edit
.. //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#7 edit
.. //depot/projects/ia64/sys/boot/efi/libefi/libefi.c#8 edit

Differences ...

==== //depot/projects/ia64/sys/boot/efi/include/i386/efibind.h#4 (text+ko) ====

@@ -18,61 +18,9 @@
 
 --*/
 
-#pragma pack()
+#include <sys/stdint.h>
 
-
-/*
- * Basic int types of various widths
- */
-
-#if (__STDC_VERSION__ < 199901L )
-
-/* No ANSI C 1999/2000 stdint.h integer width declarations */
-
-    #if _MSC_EXTENSIONS
-
-/* Use Microsoft C compiler integer width declarations */
-
-        typedef unsigned __int64    uint64_t;
-        typedef __int64             int64_t;
-        typedef unsigned __int32    uint32_t;
-        typedef __int32             int32_t;
-        typedef unsigned short      uint16_t;
-        typedef short               int16_t;
-        typedef unsigned char       uint8_t;
-        typedef char                int8_t;
-    #else             
-        #ifdef UNIX_LP64
-
-/* Use LP64 programming model from C_FLAGS for integer width declarations */
-
-            typedef unsigned long       uint64_t;
-            typedef long                int64_t;
-            typedef unsigned int        uint32_t;
-            typedef int                 int32_t;
-            typedef unsigned short      uint16_t;
-            typedef short               int16_t;
-            typedef unsigned char       uint8_t;
-            typedef char                int8_t;
-        #else
-
-/* Assume P64 programming model from C_FLAGS for integer width declarations */
-
-            typedef unsigned long long  uint64_t;
-            typedef long long           int64_t;
-            typedef unsigned int        uint32_t;
-            typedef int                 int32_t;
-            typedef unsigned short      uint16_t;
-            typedef short               int16_t;
-            typedef unsigned char       uint8_t;
-            typedef char                int8_t;
-        #endif
-    #endif
-#endif
-
-/*
- * Basic EFI types of various widths
- */
+/* Basic EFI types of various widths. */
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;

==== //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#7 (text+ko) ====

@@ -166,7 +166,7 @@
 		status = net->Start(net);
 		if (status != EFI_SUCCESS) {
 			printf("net%d: cannot start interface (status=%ld)\n",
-			    nif->nif_unit, status);
+			    nif->nif_unit, (long)status);
 			return;
 		}
 	}
@@ -175,7 +175,7 @@
 		status = net->Initialize(net, 0, 0);
 		if (status != EFI_SUCCESS) {
 			printf("net%d: cannot init. interface (status=%ld)\n",
-			    nif->nif_unit, status);
+			    nif->nif_unit, (long)status);
 			return;
 		}
 	}
@@ -187,7 +187,7 @@
 		status = net->ReceiveFilters(net, mask, 0, FALSE, 0, 0);
 		if (status != EFI_SUCCESS) {
 			printf("net%d: cannot set rx. filters (status=%ld)\n",
-			    nif->nif_unit, status);
+			    nif->nif_unit, (long)status);
 			return;
 		}
 	}

==== //depot/projects/ia64/sys/boot/efi/libefi/libefi.c#8 (text+ko) ====

@@ -98,7 +98,7 @@
 	if (status != EFI_SUCCESS)
 		BS->Exit(IH, status, 0, NULL);
 
-	setheap((void *)heap, (void *)(heap + heapsize));
+	setheap((void *)(uintptr_t)heap, (void *)(uintptr_t)(heap + heapsize));
 
 	/* Use exit() from here on... */