logging: reduce the amount of code emitted for log statements

[folly.git] / folly / MicroLock.cpp

diff --git a/folly/MicroLock.cpp b/folly/MicroLock.cpp
index dd649da1b431e9a25c027c98838e78691eb62a55..06e8de08768bb01bbb69636dffed07b198738108 100644 (file)
--- a/folly/MicroLock.cpp
+++ b/folly/MicroLock.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 #include <folly/MicroLock.h>
 #include <thread>
 
+#include <folly/portability/Asm.h>
+
 namespace folly {
 
 void MicroLockCore::lockSlowPath(uint32_t oldWord,
@@ -24,7 +26,7 @@ void MicroLockCore::lockSlowPath(uint32_t oldWord,
                                  uint32_t slotHeldBit,
                                  unsigned maxSpins,
                                  unsigned maxYields) {
-  unsigned newWord;
+  uint32_t newWord;
   unsigned spins = 0;
   uint32_t slotWaitBit = slotHeldBit << 1;