--- Time.E	libc++ r282434
+++ Time.E	libc++ r282435
@@ -623,6 +623,9 @@ inline __attribute__((__internal_linkage
 }
 # 19 "../../include/IceUtil/Config.h" 2
 # 81 "../../include/IceUtil/Config.h"
+# 1 "/usr/include/c++/v1/stdint.h" 1 3
+# 106 "/usr/include/c++/v1/stdint.h" 3
+# 119 "/usr/include/c++/v1/stdint.h" 3
 # 1 "/usr/include/stdint.h" 1 3 4
 # 35 "/usr/include/stdint.h" 3 4
 # 1 "/usr/include/machine/_stdint.h" 1 3 4
@@ -690,6 +693,7 @@ typedef __uint_fast8_t uint_fast8_t;
 typedef __uint_fast16_t uint_fast16_t;
 typedef __uint_fast32_t uint_fast32_t;
 typedef __uint_fast64_t uint_fast64_t;
+# 120 "/usr/include/c++/v1/stdint.h" 2 3
 # 82 "../../include/IceUtil/Config.h" 2
 # 104 "../../include/IceUtil/Config.h"
 # 1 "/usr/include/sys/param.h" 1 3 4
@@ -39599,12 +39603,9 @@ private:
     noncopyable(const noncopyable&);
     const noncopyable& operator=(const noncopyable&);
 };
-# 302 "../../include/IceUtil/Config.h"
-typedef long long Int64;
-
-
-
-
+# 298 "../../include/IceUtil/Config.h"
+typedef long Int64;
+# 307 "../../include/IceUtil/Config.h"
 }
 # 14 "../../include/IceUtil/Exception.h" 2
 
@@ -43707,7 +43708,7 @@ IceUtil::Time::now(Clock clock)
             ((0) ? (void)0 : __assert(__func__, "Time.cpp", 110, "0"));
             throw SyscallException("Time.cpp", 111, (* __error()));
         }
-        return Time(tv.tv_sec * 1000000LL + tv.tv_usec);
+        return Time(tv.tv_sec * 1000000L + tv.tv_usec);
 
     }
     else
@@ -43719,7 +43720,7 @@ IceUtil::Time::now(Clock clock)
             ((0) ? (void)0 : __assert(__func__, "Time.cpp", 157, "0"));
             throw SyscallException("Time.cpp", 158, (* __error()));
         }
-        return Time(ts.tv_sec * 1000000LL + ts.tv_nsec / 1000LL);
+        return Time(ts.tv_sec * 1000000L + ts.tv_nsec / 1000L);
 
     }
 }
@@ -43727,13 +43728,13 @@ IceUtil::Time::now(Clock clock)
 Time
 IceUtil::Time::seconds(Int64 t)
 {
-    return Time(t * 1000000LL);
+    return Time(t * 1000000L);
 }
 
 Time
 IceUtil::Time::milliSeconds(Int64 t)
 {
-    return Time(t * 1000LL);
+    return Time(t * 1000L);
 }
 
 Time