From 31149bb6e90ef58b1e3c6ffe6c2090543e35cfa9 Mon Sep 17 00:00:00 2001
From: yuqing <yuqing@yongche.com>
Date: Wed, 26 Aug 2015 18:45:10 +0800
Subject: [PATCH] correct PTHREAD_MUTEX_ERRORCHECK define

---
 HISTORY             | 4 +++-
 src/Makefile.in     | 3 ---
 src/common_define.h | 4 ++--
 src/pthread_func.c  | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/HISTORY b/HISTORY
index 200d5c1..571030a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,8 @@
 
-Version 1.21  2015-08-25
+Version 1.21  2015-08-26
   * ini_file_reader support annotation function
+  * correct PTHREAD_MUTEX_ERRORCHECK define
+  * support 32 bit OS
 
 Version 1.20  2015-08-06
   * add GEO function get_line_distance_km
diff --git a/src/Makefile.in b/src/Makefile.in
index ccdd9c9..f06395f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -51,9 +51,6 @@ install:
 	install -m 755 $(SHARED_LIBS) $(DESTDIR)/usr/$(LIB_VERSION)
 	mkdir -p $(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:
 	rm -f $(ALL_OBJS) $(ALL_PRGS) $(ALL_LIBS)
 
diff --git a/src/common_define.h b/src/common_define.h
index 837cf9f..697a2c2 100644
--- a/src/common_define.h
+++ b/src/common_define.h
@@ -48,12 +48,12 @@ typedef void * (*ThreadEntranceFunc)(LPVOID lpThreadParameter);
 extern int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind);
 #endif
 
+#include "_os_define.h"
+
 #ifdef OS_LINUX
 #define PTHREAD_MUTEX_ERRORCHECK PTHREAD_MUTEX_ERRORCHECK_NP
 #endif
 
-#include "_os_define.h"
-
 #ifdef OS_BITS
   #if OS_BITS == 64
     #define INT64_PRINTF_FORMAT   "%ld"
diff --git a/src/pthread_func.c b/src/pthread_func.c
index a8d5312..2ec04f4 100644
--- a/src/pthread_func.c
+++ b/src/pthread_func.c
@@ -38,7 +38,7 @@ int init_pthread_lock(pthread_mutex_t *pthread_lock)
 		return result;
 	}
 	if ((result=pthread_mutexattr_settype(&mat, \
-			PTHREAD_MUTEX_ERRORCHECK_NP)) != 0)
+			PTHREAD_MUTEX_ERRORCHECK)) != 0)
 	{
 		logError("file: "__FILE__", line: %d, " \
 			"call pthread_mutexattr_settype fail, " \