patch-2.4.20 linux-2.4.20/drivers/acpi/include/actypes.h

• Lines: 50
• Date: Thu Nov 28 15:53:12 2002
• Orig file: linux-2.4.19/drivers/acpi/include/actypes.h
• Orig date: Wed Oct 24 14:06:22 2001

diff -urN linux-2.4.19/drivers/acpi/include/actypes.h linux-2.4.20/drivers/acpi/include/actypes.h
@@ -48,8 +48,11 @@
  * UCHAR        Character. 1 byte unsigned value.
  */
 
+#ifndef BITS_PER_LONG
+#error "define BITS_PER_LONG"
+#endif
 
-#ifdef _IA64
+#if BITS_PER_LONG == 64
 /*
  * 64-bit type definitions
  */
@@ -62,7 +65,7 @@
 typedef COMPILER_DEPENDENT_UINT64       UINT64;
 
 typedef UINT64                          NATIVE_UINT;
-typedef INT64                           NATIVE_INT;
+typedef long long                          NATIVE_INT;
 
 typedef NATIVE_UINT                     ACPI_TBLPTR;
 typedef UINT64                          ACPI_IO_ADDRESS;
@@ -72,7 +75,7 @@
 #define ACPI_USE_NATIVE_DIVIDE                          /* Native 64-bit integer support */
 
 
-#elif _IA16
+#elif BITS_PER_LONG == 16
 /*
  * 16-bit type definitions
  */
@@ -109,7 +112,7 @@
 #define ACPI_NO_INTEGER64_SUPPORT
 
 
-#else
+#elif BITS_PER_LONG == 32
 /*
  * 32-bit type definitions (default)
  */
@@ -130,6 +133,9 @@
 
 #define ALIGNED_ADDRESS_BOUNDARY        0x00000004
 #define _HW_ALIGNMENT_SUPPORT
+
+#else
+#error "unknown BITS_PER_LONG"
 #endif