test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-11-30 02:47:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

compile: There's one compiling error in acl_atomic_int64_cas.

Browse Source
This commit is contained in:
zsxxsz 2017-10-01 13:59:02 +08:00
parent 3d71e10668
commit 607905bfec
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
android/acl/build.gradle
View File

@ -11,6 +11,9 @@ buildscript {
android {
compileSdkVersion 25
buildToolsVersion "26.0.0"
repositories {
maven { url 'http://repo1.maven.org/maven2' }
}
defaultConfig {
minSdkVersion 25
targetSdkVersion 25
@ -29,13 +32,14 @@ android {
}
buildTypes {
release {
minifyEnabled false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
jniDebuggable true
debuggable true
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
externalNativeBuild {
@ -54,13 +58,14 @@ android {
}
dependencies {
//compile fileTree(dir: 'libs', include: ['*.jar'])
//androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
// exclude group: 'com.android.support', module: 'support-annotations'
//})
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
//compile 'com.android.support:appcompat-v7:25.3.1'
//compile 'com.android.support.constraint:constraint-layout:1.0.2'
//testCompile 'junit:junit:4.12'
compile files('libs/junit-4.12.jar')
}
allprojects {

2
lib_acl/src/stdlib/acl_atomic.c
View File

@ -195,7 +195,7 @@ long long acl_atomic_int64_cas(ACL_ATOMIC *self, long long cmp, long long n)
acl_pthread_mutex_unlock(&self->lock);
return old;
#elif defined(ACL_WINDOWS)
return InterlockedCompareExchange64((volatile LONG LONG*)&self->value,
return InterlockedCompareExchange64((volatile LONGLONG*)&self->value,
n, cmp);
#else
return (long long) __sync_val_compare_and_swap(