From 106901a41de6d6b14e0f50eb5d74f73d0a770517 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Thu, 26 Dec 2019 17:13:38 +0800
Subject: [PATCH] #1022

---
 CMakeLists.txt                      | 6 ++----
 src/kit/shell/src/shellLinux.c      | 2 +-
 src/kit/taosdemo/taosdemo.c         | 6 +++---
 src/kit/taosdump/taosdump.c         | 7 +++----
 src/os/linux/inc/os.h               | 4 ++--
 src/os/linux/src/tlinux.c           | 4 ++--
 src/os/linux/src/tsystem.c          | 2 +-
 src/system/detail/src/vnodeImport.c | 5 +++++
 8 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 938997b23e..d2d3f43730 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,8 +161,7 @@ IF (NOT DEFINED TD_CLUSTER)
       MESSAGE(STATUS "The current OS is Alpine, append extra flags")
       SET(COMMON_FLAGS "${COMMON_FLAGS} -largp")
       link_libraries(/usr/lib/libargp.a)
-    ELSE ()
-      ADD_DEFINITIONS(-D__USE_GNU)
+      ADD_DEFINITIONS(-D_ALPINE)
     ENDIF ()
   ELSEIF (TD_LINUX_32)
     IF (NOT TD_ARM)
@@ -178,8 +177,7 @@ IF (NOT DEFINED TD_CLUSTER)
       MESSAGE(STATUS "The current OS is Alpine, add extra flags")
       SET(COMMON_FLAGS "${COMMON_FLAGS} -largp")
       link_library(/usr/lib/libargp.a)
-    ELSE ()
-      ADD_DEFINITIONS(-D__USE_GNU)
+      ADD_DEFINITIONS(-D_ALPINE)
     ENDIF ()
   ELSEIF (TD_WINDOWS_64)
     SET(CMAKE_GENERATOR "NMake Makefiles" CACHE INTERNAL "" FORCE)
diff --git a/src/kit/shell/src/shellLinux.c b/src/kit/shell/src/shellLinux.c
index 12202f95ac..bcb9c7b4e7 100644
--- a/src/kit/shell/src/shellLinux.c
+++ b/src/kit/shell/src/shellLinux.c
@@ -130,7 +130,7 @@ void shellParseArgument(int argc, char *argv[], struct arguments *arguments) {
   
   argp_parse(&argp, argc, argv, 0, 0, arguments);
   if (arguments->abort) {
-    #ifdef __USE_GNU
+    #ifndef _ALPINE
       error(10, 0, "ABORTED");
     #else
       abort();
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index d95a27548c..4b7b073eed 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -17,8 +17,8 @@
 
 #include <argp.h>
 #include <assert.h>
-#if !defined (__USE_GNU) && defined (LINUX)
-#else
+
+#ifndef _ALPINE
 #include <error.h>
 #endif
 #include <pthread.h>
@@ -313,7 +313,7 @@ int main(int argc, char *argv[]) {
   argp_parse(&argp, argc, argv, 0, 0, &arguments);
 
   if (arguments.abort) {
-    #ifdef __USE_GNU
+    #ifndef _ALPINE
       error(10, 0, "ABORTED");
     #else
       abort();
diff --git a/src/kit/taosdump/taosdump.c b/src/kit/taosdump/taosdump.c
index ba2c6c1074..f722d24c26 100644
--- a/src/kit/taosdump/taosdump.c
+++ b/src/kit/taosdump/taosdump.c
@@ -15,9 +15,8 @@
 
 #include <argp.h>
 #include <assert.h>
-#if !defined (__USE_GNU) && defined (LINUX)
-#else
-#include <error.h>
+#ifndef _ALPINE
+  #include <error.h>
 #endif
 #include <fcntl.h>
 #include <stdbool.h>
@@ -339,7 +338,7 @@ int main(int argc, char *argv[]) {
   argp_parse(&argp, argc, argv, 0, 0, &arguments);
 
   if (arguments.abort) {
-    #ifdef __USE_GNU
+    #ifndef _ALPINE
       error(10, 0, "ABORTED");
     #else
       abort();
diff --git a/src/os/linux/inc/os.h b/src/os/linux/inc/os.h
index e4b7b073f9..cf1ac76960 100644
--- a/src/os/linux/inc/os.h
+++ b/src/os/linux/inc/os.h
@@ -23,7 +23,7 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef __USE_GNU
+#ifndef _ALPINE
   #include <error.h>
 #endif
 
@@ -232,7 +232,7 @@ void taosSetCoreDump();
 
 void taosBlockSIGPIPE();
 
-#ifndef __USE_GNU
+#ifdef _ALPINE
   typedef int(*__compar_fn_t)(const void *, const void *);
   void  error (int, int, const char *);
   #ifndef PTHREAD_MUTEX_RECURSIVE_NP
diff --git a/src/os/linux/src/tlinux.c b/src/os/linux/src/tlinux.c
index 1591806d36..ccd6fc8a34 100644
--- a/src/os/linux/src/tlinux.c
+++ b/src/os/linux/src/tlinux.c
@@ -234,8 +234,8 @@ void *taosProcessAlarmSignal(void *tharg) {
 
   timer_t         timerId;
   struct sigevent sevent;
-  
-  #ifndef __USE_GNU
+
+  #ifdef _ALPINE
     sevent.sigev_notify = SIGEV_THREAD;
     sevent.sigev_value.sival_int = syscall(__NR_gettid);
   #else
diff --git a/src/os/linux/src/tsystem.c b/src/os/linux/src/tsystem.c
index afb595552f..c3b8b41c9d 100644
--- a/src/os/linux/src/tsystem.c
+++ b/src/os/linux/src/tsystem.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifndef __USE_GNU
+#ifdef _ALPINE
 #include <linux/sysctl.h>
 #else
 #include <sys/sysctl.h>
diff --git a/src/system/detail/src/vnodeImport.c b/src/system/detail/src/vnodeImport.c
index 8d9e741c98..f7f01a3c69 100644
--- a/src/system/detail/src/vnodeImport.c
+++ b/src/system/detail/src/vnodeImport.c
@@ -579,7 +579,12 @@ static int vnodeCloseImportFiles(SMeterObj *pObj, SImportHandle *pHandle) {
   SVnodeObj *pVnode = vnodeList + pObj->vnode;
   char       dpath[TSDB_FILENAME_LEN] = "\0";
   SCompInfo  compInfo;
+
+#ifdef _ALPINE
   off_t    offset = 0;
+#else
+  __off_t  offset = 0;
+#endif
 
   if (pVnode->nfd > 0) {
     offset = lseek(pVnode->nfd, 0, SEEK_CUR);
-- 
GitLab