[cfe-commits] r97532 - /cfe/trunk/lib/Frontend/RewriteObjC.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Mon Mar  1 19:19:04 2010
New Revision: 97532

URL: http://llvm.org/viewvc/llvm-project?rev=97532&view=rev
Log:
Cast a pointer to 'long long' to satisfy all compilation models.
Satisfies radar 7703202.

Modified:
    cfe/trunk/lib/Frontend/RewriteObjC.cpp

Modified: cfe/trunk/lib/Frontend/RewriteObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/RewriteObjC.cpp?rev=97532&r1=97531&r2=97532&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/RewriteObjC.cpp (original)
+++ cfe/trunk/lib/Frontend/RewriteObjC.cpp Mon Mar  1 19:19:04 2010
@@ -640,7 +640,9 @@
     Preamble += "#define __block\n";
     Preamble += "#define __weak\n";
   }
-  Preamble += "\n#define __OFFSETOFIVAR__(TYPE, MEMBER) ((long) &((TYPE *)0)->MEMBER)\n";
+  // NOTE! Windows uses LLP64 for 64bit mode. So, cast pointer to long long
+  // as this avoids warning in any 64bit/32bit compilation model.
+  Preamble += "\n#define __OFFSETOFIVAR__(TYPE, MEMBER) ((long long) &((TYPE *)0)->MEMBER)\n";
 }