pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correct PTHREAD_MUTEX_ERRORCHECK define

pull/1/merge
yuqing 2015-08-26 18:45:10 +08:00
parent c7c9d2a19f
commit 31149bb6e9
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -1,6 +1,8 @@
Version 1.21 2015-08-25 Version 1.21 2015-08-26
* ini_file_reader support annotation function * ini_file_reader support annotation function
* correct PTHREAD_MUTEX_ERRORCHECK define
* support 32 bit OS
Version 1.20 2015-08-06 Version 1.20 2015-08-06
* add GEO function get_line_distance_km * add GEO function get_line_distance_km

3
src/Makefile.in
View File

@ -51,9 +51,6 @@ install:
install -m 755 $(SHARED_LIBS) $(DESTDIR)/usr/$(LIB_VERSION) install -m 755 $(SHARED_LIBS) $(DESTDIR)/usr/$(LIB_VERSION)
mkdir -p $(DESTDIR)/usr/include/fastcommon mkdir -p $(DESTDIR)/usr/include/fastcommon
install -m 644 $(HEADER_FILES) $(DESTDIR)/usr/include/fastcommon install -m 644 $(HEADER_FILES) $(DESTDIR)/usr/include/fastcommon
# cd $(DESTDIR)/usr/$(LIB_VERSION) && ln -fs libfastcommon.so.1 libfastcommon.so
# ln -fs $(DESTDIR)/usr/local/$(LIB_VERSION)/libfastcommon.so.1 $(DESTDIR)/usr/local/$(LIB_VERSION)/libfastcommon.so
# sh ./fast_link_library.sh
clean: clean:
rm -f $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS) rm -f $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS)

4
src/common_define.h
View File

@ -48,12 +48,12 @@ typedef void * (*ThreadEntranceFunc)(LPVOID lpThreadParameter);
extern int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind); extern int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind);
#endif #endif
#include "_os_define.h"
#ifdef OS_LINUX #ifdef OS_LINUX
#define PTHREAD_MUTEX_ERRORCHECK PTHREAD_MUTEX_ERRORCHECK_NP #define PTHREAD_MUTEX_ERRORCHECK PTHREAD_MUTEX_ERRORCHECK_NP
#endif #endif
#include "_os_define.h"
#ifdef OS_BITS #ifdef OS_BITS
#if OS_BITS == 64 #if OS_BITS == 64
#define INT64_PRINTF_FORMAT "%ld" #define INT64_PRINTF_FORMAT "%ld"

2
src/pthread_func.c
View File

@ -38,7 +38,7 @@ int init_pthread_lock(pthread_mutex_t *pthread_lock)
return result; return result;
} }
if ((result=pthread_mutexattr_settype(&mat, \ if ((result=pthread_mutexattr_settype(&mat, \
PTHREAD_MUTEX_ERRORCHECK_NP)) != 0) PTHREAD_MUTEX_ERRORCHECK)) != 0)
{ {
logError("file: "__FILE__", line: %d, " \ logError("file: "__FILE__", line: %d, " \
"call pthread_mutexattr_settype fail, " \ "call pthread_mutexattr_settype fail, " \