diff options
author | Brad King <brad.king@kitware.com> | 2011-11-17 15:16:57 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2011-11-17 15:16:57 (GMT) |
commit | aaf376594cf4ae1d541189a2789382db47aa5d7b (patch) | |
tree | 84cc3aa6990bbcd37333d00a490764f70c405bd2 /Utilities/KWIML/ABI.h.in | |
parent | 21469b65dd9238b1737acfcd57886f83578ecab7 (diff) | |
parent | 9ccd639ad70c65b844f6610c5ae08a63e25f6806 (diff) | |
download | CMake-aaf376594cf4ae1d541189a2789382db47aa5d7b.zip CMake-aaf376594cf4ae1d541189a2789382db47aa5d7b.tar.gz CMake-aaf376594cf4ae1d541189a2789382db47aa5d7b.tar.bz2 |
Merge branch 'upstream-kwiml' into update-KWIML
Diffstat (limited to 'Utilities/KWIML/ABI.h.in')
-rw-r--r-- | Utilities/KWIML/ABI.h.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Utilities/KWIML/ABI.h.in b/Utilities/KWIML/ABI.h.in index c4121ff..0ec6d0e 100644 --- a/Utilities/KWIML/ABI.h.in +++ b/Utilities/KWIML/ABI.h.in @@ -216,7 +216,8 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined. # endif #endif #if !defined(@KWIML@_ABI_SIZEOF_LONG_LONG) -# if defined(_LONGLONG) /* SGI, some GNU, perhaps others. */ +# if defined(_LONGLONG) /* SGI, some GNU, perhaps others. */ \ + && !defined(_MSC_VER) # define @KWIML@_ABI_SIZEOF_LONG_LONG 8 # elif defined(_LONG_LONG) /* IBM XL, perhaps others. */ # define @KWIML@_ABI_SIZEOF_LONG_LONG 8 |