Author: obrien
Date: Thu May 24 21:44:46 2012
New Revision: 235939
URL: http://svn.freebsd.org/changeset/base/235939

Log:
  Consitently use "__LP64__".
  [there are 33 __LP64__'s in the kernel (minus cddl/ and contrib/),
  and 11 _LP64's]

Modified:
  head/lib/libstand/bswap.c
  head/sys/x86/include/_limits.h
  head/sys/x86/include/_stdint.h
  head/sys/x86/include/_types.h
  head/sys/x86/include/float.h

Modified: head/lib/libstand/bswap.c
==============================================================================
--- head/lib/libstand/bswap.c   Thu May 24 21:24:23 2012        (r235938)
+++ head/lib/libstand/bswap.c   Thu May 24 21:44:46 2012        (r235939)
@@ -31,7 +31,7 @@ bswap32(u_int32_t x)
 u_int64_t
 bswap64(u_int64_t x)
 {
-#ifdef _LP64
+#ifdef __LP64__
        /*
         * Assume we have wide enough registers to do it without touching
         * memory.

Modified: head/sys/x86/include/_limits.h
==============================================================================
--- head/sys/x86/include/_limits.h      Thu May 24 21:24:23 2012        
(r235938)
+++ head/sys/x86/include/_limits.h      Thu May 24 21:44:46 2012        
(r235939)
@@ -57,7 +57,7 @@
 #define        __INT_MAX       0x7fffffff      /* max value for an int */
 #define        __INT_MIN       (-0x7fffffff - 1)       /* min value for an int 
*/
 
-#ifdef _LP64
+#ifdef __LP64__
 #define        __ULONG_MAX     0xffffffffffffffff      /* max for an unsigned 
long */
 #define        __LONG_MAX      0x7fffffffffffffff      /* max for a long */
 #define        __LONG_MIN      (-0x7fffffffffffffff - 1) /* min for a long */
@@ -72,7 +72,7 @@
 #define        __LLONG_MAX     0x7fffffffffffffffLL    /* max value for a long 
long */
 #define        __LLONG_MIN     (-0x7fffffffffffffffLL - 1)  /* min for a long 
long */
 
-#ifdef _LP64
+#ifdef __LP64__
 #define        __SSIZE_MAX     __LONG_MAX      /* max value for a ssize_t */
 #define        __SIZE_T_MAX    __ULONG_MAX     /* max value for a size_t */
 #define        __OFF_MAX       __LONG_MAX      /* max value for an off_t */

Modified: head/sys/x86/include/_stdint.h
==============================================================================
--- head/sys/x86/include/_stdint.h      Thu May 24 21:24:23 2012        
(r235938)
+++ head/sys/x86/include/_stdint.h      Thu May 24 21:44:46 2012        
(r235939)
@@ -50,7 +50,7 @@
 #define        UINT16_C(c)             (c)
 #define        UINT32_C(c)             (c ## U)
 
-#ifdef _LP64
+#ifdef __LP64__
 #define        INT64_C(c)              (c ## L)
 #define        UINT64_C(c)             (c ## UL)
 #else
@@ -81,7 +81,7 @@
 #define        UINT16_MAX      0xffff
 #define        UINT32_MAX      0xffffffffU
 
-#ifdef _LP64
+#ifdef __LP64__
 #define        INT64_MIN       (-0x7fffffffffffffff-1)
 #define        INT64_MAX       0x7fffffffffffffff
 #define        UINT64_MAX      0xffffffffffffffff
@@ -139,7 +139,7 @@
  * ISO/IEC 9899:1999
  * 7.18.2.4  Limits of integer types capable of holding object pointers
  */
-#ifdef _LP64
+#ifdef __LP64__
 #define        INTPTR_MIN      INT64_MIN
 #define        INTPTR_MAX      INT64_MAX
 #define        UINTPTR_MAX     UINT64_MAX
@@ -161,7 +161,7 @@
  * ISO/IEC 9899:1999
  * 7.18.3  Limits of other integer types
  */
-#ifdef _LP64
+#ifdef __LP64__
 /* Limits of ptrdiff_t. */
 #define        PTRDIFF_MIN     INT64_MIN       
 #define        PTRDIFF_MAX     INT64_MAX

Modified: head/sys/x86/include/_types.h
==============================================================================
--- head/sys/x86/include/_types.h       Thu May 24 21:24:23 2012        
(r235938)
+++ head/sys/x86/include/_types.h       Thu May 24 21:44:46 2012        
(r235939)
@@ -54,7 +54,7 @@ typedef       short                   __int16_t;
 typedef        unsigned short          __uint16_t;
 typedef        int                     __int32_t;
 typedef        unsigned int            __uint32_t;
-#ifdef _LP64
+#ifdef __LP64__
 typedef        long                    __int64_t;
 typedef        unsigned long           __uint64_t;
 #else
@@ -73,7 +73,7 @@ typedef       unsigned long long      __uint64_t;
 /*
  * Standard type definitions.
  */
-#ifdef _LP64
+#ifdef __LP64__
 typedef        __int32_t       __clock_t;              /* clock()... */
 typedef        __int64_t       __critical_t;
 typedef        double          __double_t;
@@ -97,7 +97,7 @@ typedef       __int8_t        __int_least8_t;
 typedef        __int16_t       __int_least16_t;
 typedef        __int32_t       __int_least32_t;
 typedef        __int64_t       __int_least64_t;
-#ifdef _LP64
+#ifdef __LP64__
 typedef        __int64_t       __ptrdiff_t;            /* ptr1 - ptr2 */
 typedef        __int64_t       __register_t;
 typedef        __int64_t       __segsz_t;              /* segment size (in 
pages) */
@@ -125,7 +125,7 @@ typedef     __uint8_t       __uint_least8_t;
 typedef        __uint16_t      __uint_least16_t;
 typedef        __uint32_t      __uint_least32_t;
 typedef        __uint64_t      __uint_least64_t;
-#ifdef _LP64
+#ifdef __LP64__
 typedef        __uint64_t      __u_register_t;
 typedef        __uint64_t      __vm_offset_t;
 typedef        __uint64_t      __vm_paddr_t;

Modified: head/sys/x86/include/float.h
==============================================================================
--- head/sys/x86/include/float.h        Thu May 24 21:24:23 2012        
(r235938)
+++ head/sys/x86/include/float.h        Thu May 24 21:44:46 2012        
(r235939)
@@ -42,7 +42,7 @@ __END_DECLS
 #define FLT_RADIX      2               /* b */
 #define FLT_ROUNDS     __flt_rounds()
 #if __ISO_C_VISIBLE >= 1999
-#ifdef _LP64
+#ifdef __LP64__
 #define        FLT_EVAL_METHOD 0               /* no promotions */
 #else
 #define        FLT_EVAL_METHOD (-1)            /* i387 semantics 
are...interesting */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to