Define uint64 and int64 using long long.

webrtc/base/helpers.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/base/helpers.h"
 
 #include <limits>
 
 #if defined(FEATURE_ENABLE_SSL)
 #include "webrtc/base/sslconfig.h"
 #if defined(SSL_USE_OPENSSL)
 #include <openssl/rand.h>
 #elif defined(SSL_USE_NSS_RNG)
+// Hack: Define+undefine int64 and uint64 to avoid typedef conflict with NSS.
+// TODO(kjellander): Remove when webrtc:4497 is completed.
+#define uint64 foo_uint64
+#define int64 foo_int64
 #include "pk11func.h"
+#undef uint64
+#undef int64
 #else
 #if defined(WEBRTC_WIN)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <ntsecapi.h>
-#endif  // WEBRTC_WIN 
+#endif  // WEBRTC_WIN
 #endif  // else
 #endif  // FEATURE_ENABLED_SSL
 
 #include "webrtc/base/base64.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/timeutils.h"
 
 // Protect against max macro inclusion.
@@ skipping 97 matching lines @@
       bytes[i] = static_cast<char>(rand());
     }
     return true;
   }
 };
 
 #else
 
 #error No SSL implementation has been selected!
 
-#endif  // WEBRTC_WIN 
+#endif  // WEBRTC_WIN
 #endif
 
 // A test random generator, for predictable output.
 class TestRandomGenerator : public RandomGenerator {
  public:
   TestRandomGenerator() : seed_(7) {
   }
   ~TestRandomGenerator() override {
   }
   bool Init(const void* seed, size_t len) override { return true; }
@@ skipping 107 matching lines @@
   } while (id == 0);
   return id;
 }
 
 double CreateRandomDouble() {
   return CreateRandomId() / (std::numeric_limits<uint32>::max() +
       std::numeric_limits<double>::epsilon());
 }
 
 }  // namespace rtc