More linux ifdef tweaks. This reverts my earlier change (13503)....

skia/include/corecg/SkUserConfig.h

 /* include/corecg/SkUserConfig.h
 **
 ** Copyright 2006, Google Inc.
 **
 ** Licensed under the Apache License, Version 2.0 (the "License"); 
 ** you may not use this file except in compliance with the License. 
 ** You may obtain a copy of the License at 
 **
 **     http://www.apache.org/licenses/LICENSE-2.0 
 **
@@ skipping 127 matching lines @@
 // Below we set the order for ARGB channels in registers. I suspect that, on
 // big endian machines, you can keep this the same and everything will work.
 // The in-memory order will be different, of course, but as long as everything
 // is reading memory as words rather than bytes, it will all work. However, if
 // you find that colours are messed up I thought that I would leave a helpful
 // locator for you. Also see the comments in
 // base/gfx/bitmap_platform_device_linux.h
 #error Read the comment at this location
 #endif
 
-#ifdef LINUX2
-#define SK_A32_SHIFT 24
-#define SK_B32_SHIFT 16
-#define SK_G32_SHIFT 8
-#define SK_R32_SHIFT 0
-#else
 // For Linux we want to match the most common X visual, which is
 // ARGB (in registers)
 #define SK_A32_SHIFT 24
 #define SK_R32_SHIFT 16
 #define SK_G32_SHIFT 8
 #define SK_B32_SHIFT 0
-#endif
 
 #endif
 
 // The default crash macro writes to badbeef which can cause some strange
 // problems. Instead, pipe this through to the logging function as a fatal
 // assertion.
 #define SK_CRASH() SkDebugf_FileLine(__FILE__, __LINE__, true, "SK_CRASH")
 
 // TODO(brettw) bug 6373: Re-enable Skia assertions. This is blocked on fixing
 // some of our transparency handling which generates purposely-invalid colors,
 // in turn causing assertions.
 //#ifndef NDEBUG
 //  #define SK_DEBUG
 //  #undef SK_RELEASE
   #undef SK_SUPPORT_UNITTEST  // This is only necessary in debug mode since
                               // we've disabled assertions. When we re-enable
                               // them, this line can be removed.
 //#else
   #define SK_RELEASE
   #undef SK_DEBUG
 //#endif
 
 // ===== End Chrome-specific definitions =====
 
 #endif