From: yoonki.park Date: Wed, 16 Oct 2013 03:44:11 +0000 (+0900) Subject: change compiler to llvm in case of Mac X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=383ff20116edd14ce167fc365b8d510b72454136;p=sdk%2Ftools%2Fsdb.git change compiler to llvm in case of Mac Change-Id: I8b928bd3dcb8a9ddc1300e22bcda9cea910e967d Signed-off-by: yoonki.park --- diff --git a/Makefile b/Makefile index 918b434..4a0f5fc 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,9 @@ HOST_OS := $(shell uname -s | tr A-Z a-z | cut -d'_' -f1) # sdb host tool # ========================================================= -CC := gcc +ifeq ($(HOST_OS),darwin) + CC := clang +endif # ifeq ($(HOST_OS),linux) diff --git a/src/commandline.c b/src/commandline.c index f5bd80d..6f0d9fb 100755 --- a/src/commandline.c +++ b/src/commandline.c @@ -263,7 +263,7 @@ const char* get_basename(const char* filename) } } -int __inline__ get_server_port() { +int get_server_port() { return DEFAULT_SDB_PORT; } diff --git a/src/commandline.h b/src/commandline.h index ea018a9..92486c9 100644 --- a/src/commandline.h +++ b/src/commandline.h @@ -47,7 +47,7 @@ int send_shellcommand(char* buf, void** extargv); int process_cmdline(int argc, char** argv); void read_and_dump(int fd); int interactive_shell(void** extargv); -int __inline__ get_server_port(); +int get_server_port(); int __sdb_command(const char* cmd, void** extargv); #endif /* COMMANDLINE_H_ */ diff --git a/src/file_sync_client.c b/src/file_sync_client.c index ffc8f11..e2c9d8f 100644 --- a/src/file_sync_client.c +++ b/src/file_sync_client.c @@ -38,7 +38,7 @@ static __inline__ void finalize(int srcfd, int dstfd, FILE_FUNC* srcF, FILE_FUNC* dstF); -__inline__ void create_copy_info(COPY_INFO** info, char* srcp, char* dstp) { +void create_copy_info(COPY_INFO** info, char* srcp, char* dstp) { *info = (COPY_INFO*)malloc(sizeof(COPY_INFO)); (*info)->src = srcp; (*info)->dst = dstp; diff --git a/src/file_sync_client.h b/src/file_sync_client.h index 7bb53bb..8381a1c 100644 --- a/src/file_sync_client.h +++ b/src/file_sync_client.h @@ -29,7 +29,7 @@ #include "file_sync_functions.h" -__inline__ void create_copy_info(COPY_INFO** info, char* srcp, char* dstp); +void create_copy_info(COPY_INFO** info, char* srcp, char* dstp); int do_sync_copy(char* srcp, char* dstp, FILE_FUNC* srcF, FILE_FUNC* dstF, int is_utf8, void** ext_argv); #endif /* FILE_SYNC_CLIENT_H_ */