Kouhei Sutou
null+****@clear*****
Fri Feb 16 17:26:52 JST 2018
Kouhei Sutou 2018-02-16 17:26:52 +0900 (Fri, 16 Feb 2018) New Revision: e98a3cd05529d6a0ff1b5fe798ec197aa3fd5892 https://github.com/groonga/groonga/commit/e98a3cd05529d6a0ff1b5fe798ec197aa3fd5892 Message: Remove unused macros Modified files: lib/grn.h Modified: lib/grn.h (+0 -23) =================================================================== --- lib/grn.h 2018-02-16 17:25:57 +0900 (b5dbd62db) +++ lib/grn.h 2018-02-16 17:26:52 +0900 (c440ab76a) @@ -226,16 +226,6 @@ typedef pthread_mutex_t grn_mutex; # define MUTEX_LOCK_CHECK(m) (MUTEX_LOCK(m) == 0) # define MUTEX_UNLOCK(m) pthread_mutex_unlock(&(m)) # define MUTEX_FIN(m) pthread_mutex_destroy(&(m)) -# ifdef HAVE_PTHREAD_MUTEXATTR_SETPSHARED -# define MUTEX_INIT_SHARED(m) do {\ - pthread_mutexattr_t mutexattr;\ - pthread_mutexattr_init(&mutexattr);\ - pthread_mutexattr_setpshared(&mutexattr, PTHREAD_PROCESS_SHARED);\ - pthread_mutex_init(&(m), &mutexattr);\ -} while (0) -# else -# define MUTEX_INIT_SHARED MUTEX_INIT -# endif /* HAVE_PTHREAD_MUTEXATTR_SETPSHARED */ typedef pthread_mutex_t grn_critical_section; # define CRITICAL_SECTION_INIT(cs) pthread_mutex_init(&(cs), NULL) @@ -248,16 +238,6 @@ typedef pthread_cond_t grn_cond; # define COND_SIGNAL(c) pthread_cond_signal(&(c)) # define COND_WAIT(c,m) pthread_cond_wait(&(c), &(m)) # define COND_BROADCAST(c) pthread_cond_broadcast(&(c)) -# ifdef HAVE_PTHREAD_CONDATTR_SETPSHARED -# define COND_INIT_SHARED(c) do {\ - pthread_condattr_t condattr;\ - pthread_condattr_init(&condattr);\ - pthread_condattr_setpshared(&condattr, PTHREAD_PROCESS_SHARED);\ - pthread_cond_init(&(c), &condattr);\ -} while (0) -# else -# define COND_INIT_SHARED COND_INIT -# endif /* HAVE_PTHREAD_CONDATTR_SETPSHARE */ # define COND_FIN(c) pthread_cond_destroy(&(c)) typedef pthread_key_t grn_thread_key; @@ -414,9 +394,6 @@ typedef int grn_cond; # endif /* WIN32 */ -# define MUTEX_INIT_SHARED MUTEX_INIT -# define COND_INIT_SHARED COND_INIT - # define GRN_TEST_YIELD() do {} while (0) #endif /* HAVE_PTHREAD_H */ -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180216/e77f357c/attachment-0001.htm