Commit 21aa0ee0 by Alan Mishchenko

Addressing recently reported Bitbucket Issue #72 and #73.

parent d0286dce
...@@ -103,7 +103,7 @@ ABC_NAMESPACE_HEADER_START ...@@ -103,7 +103,7 @@ ABC_NAMESPACE_HEADER_START
*/ */
#if defined(__ccdoc__) #if defined(__ccdoc__)
typedef platform_dependent_type ABC_PTRDIFF_T; typedef platform_dependent_type ABC_PTRDIFF_T;
#elif defined(LIN64) || defined(__x86_64__) #elif defined(LIN64)
typedef long ABC_PTRDIFF_T; typedef long ABC_PTRDIFF_T;
#elif defined(NT64) #elif defined(NT64)
typedef long long ABC_PTRDIFF_T; typedef long long ABC_PTRDIFF_T;
...@@ -120,7 +120,7 @@ typedef int ABC_PTRDIFF_T; ...@@ -120,7 +120,7 @@ typedef int ABC_PTRDIFF_T;
*/ */
#if defined(__ccdoc__) #if defined(__ccdoc__)
typedef platform_dependent_type ABC_PTRUINT_T; typedef platform_dependent_type ABC_PTRUINT_T;
#elif defined(LIN64) || defined(__x86_64__) #elif defined(LIN64)
typedef unsigned long ABC_PTRUINT_T; typedef unsigned long ABC_PTRUINT_T;
#elif defined(NT64) #elif defined(NT64)
typedef unsigned long long ABC_PTRUINT_T; typedef unsigned long long ABC_PTRUINT_T;
...@@ -137,7 +137,7 @@ typedef unsigned int ABC_PTRUINT_T; ...@@ -137,7 +137,7 @@ typedef unsigned int ABC_PTRUINT_T;
*/ */
#if defined(__ccdoc__) #if defined(__ccdoc__)
typedef platform_dependent_type ABC_PTRINT_T; typedef platform_dependent_type ABC_PTRINT_T;
#elif defined(LIN64) || defined(__x86_64__) #elif defined(LIN64)
typedef long ABC_PTRINT_T; typedef long ABC_PTRINT_T;
#elif defined(NT64) #elif defined(NT64)
typedef long long ABC_PTRINT_T; typedef long long ABC_PTRINT_T;
...@@ -152,7 +152,7 @@ typedef int ABC_PTRINT_T; ...@@ -152,7 +152,7 @@ typedef int ABC_PTRINT_T;
*/ */
#if defined(__ccdoc__) #if defined(__ccdoc__)
typedef platform_dependent_type ABC_INT64_T; typedef platform_dependent_type ABC_INT64_T;
#elif defined(LIN64) || defined(__x86_64__) #elif defined(LIN64)
typedef long ABC_INT64_T; typedef long ABC_INT64_T;
#elif defined(NT64) || defined(LIN) #elif defined(NT64) || defined(LIN)
typedef long long ABC_INT64_T; typedef long long ABC_INT64_T;
...@@ -167,7 +167,7 @@ typedef signed __int64 ABC_INT64_T; ...@@ -167,7 +167,7 @@ typedef signed __int64 ABC_INT64_T;
*/ */
#if defined(__ccdoc__) #if defined(__ccdoc__)
typedef platform_dependent_type ABC_UINT64_T; typedef platform_dependent_type ABC_UINT64_T;
#elif defined(LIN64) || defined(__x86_64__) #elif defined(LIN64)
typedef unsigned long ABC_UINT64_T; typedef unsigned long ABC_UINT64_T;
#elif defined(NT64) || defined(LIN) #elif defined(NT64) || defined(LIN)
typedef unsigned long long ABC_UINT64_T; typedef unsigned long long ABC_UINT64_T;
......
...@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA ...@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
#define Glucose_System_h #define Glucose_System_h
#if defined(__linux__) #if defined(__linux__)
#include <fpu_control.h> //#include <fpu_control.h>
#endif #endif
#include "sat/glucose/IntTypes.h" #include "sat/glucose/IntTypes.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment