Fix/override bad symbol names

[folly.git] / folly / DiscriminatedPtr.h

diff --git a/folly/DiscriminatedPtr.h b/folly/DiscriminatedPtr.h
index 1332701d3560e53fca8b5fc4b3285f3441196c21..02cd1b2ab3357494b7cf40015535fee31d74f868 100644 (file)
--- a/folly/DiscriminatedPtr.h
+++ b/folly/DiscriminatedPtr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Facebook, Inc.
+ * Copyright 2014 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,10 +30,11 @@
 #include <limits>
 #include <stdexcept>
 #include <glog/logging.h>
-#include "folly/Likely.h"
-#include "folly/detail/DiscriminatedPtrDetail.h"
+#include <folly/Likely.h>
+#include <folly/Portability.h>
+#include <folly/detail/DiscriminatedPtrDetail.h>
 
-#ifndef __x86_64__
+#if !FOLLY_X64
 # error "DiscriminatedPtr is x64-specific code."
 #endif
 
@@ -218,4 +219,3 @@ class DiscriminatedPtr {
 }  // namespace folly
 
 #endif /* FOLLY_DISCRIMINATEDPTR_H_ */
-