patch_centos
Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
patch_centos [2015/01/21 17:10] kyxap |
patch_centos [2015/01/21 17:25] (current) kyxap |
||
|---|---|---|---|
| Line 1: | Line 1: | ||
| {{tag>centos oops proxy checkinstall patch}}====== Патч для oops-1.5.23, решающий проблему компиляции под CentOS ====== | {{tag>centos oops proxy checkinstall patch}}====== Патч для oops-1.5.23, решающий проблему компиляции под CentOS ====== | ||
| - | <code C> | + | <file diff oops-1.5.24-pthread-rwlock.patch>diff -Nru oops-1.5.23.orig/src/lib/rwlock/rwlock.c oops-1.5.23/src/lib/rwlock/rwlock.c |
| - | diff -Nru oops-1.5.23.orig/src/lib/rwlock/rwlock.c oops-1.5.23/src/lib/rwlock/rwlock.c | + | --- oops-1.5.23.orig/src/lib/rwlock/rwlock.c 2000-11-29 19:03:35.000000000 +0200 |
| - | --- oops-1.5.23.orig/src/lib/rwlock/rwlock.c 2000-11-29 19:03:35.000000000 +0200 | + | +++ oops-1.5.23/src/lib/rwlock/rwlock.c 2006-09-06 00:30:36.000000000 +0300 |
| - | +++ oops-1.5.23/src/lib/rwlock/rwlock.c 2006-09-06 00:30:36.000000000 +0300 | + | |
| @@ -53,6 +53,8 @@ | @@ -53,6 +53,8 @@ | ||
| #include <pthread.h> | #include <pthread.h> | ||
| #include "rwlock.h" | #include "rwlock.h" | ||
| - | + | ||
| +#if defined(OOPS_IMPLEMENT_RWLOCK) | +#if defined(OOPS_IMPLEMENT_RWLOCK) | ||
| + | + | ||
| /* maximum number of times a read lock may be obtained */ | /* maximum number of times a read lock may be obtained */ | ||
| - | #define MAX_READ_LOCKS (INT_MAX - 1) | + | #define MAX_READ_LOCKS (INT_MAX - 1) |
| - | + | ||
| @@ -375,4 +377,6 @@ | @@ -375,4 +377,6 @@ | ||
| - | return(0); | + | return(0); |
| } | } | ||
| - | + | ||
| +#endif /* defined(OOPS_IMPLEMENT_RWLOCK) */ | +#endif /* defined(OOPS_IMPLEMENT_RWLOCK) */ | ||
| + | + | ||
| #endif /* _THREAD_SAFE || _PTHREADS || _REENTRANT */ | #endif /* _THREAD_SAFE || _PTHREADS || _REENTRANT */ | ||
| diff -Nru oops-1.5.23.orig/src/lib/rwlock/rwlock.h oops-1.5.23/src/lib/rwlock/rwlock.h | diff -Nru oops-1.5.23.orig/src/lib/rwlock/rwlock.h oops-1.5.23/src/lib/rwlock/rwlock.h | ||
| - | --- oops-1.5.23.orig/src/lib/rwlock/rwlock.h 2003-10-06 17:15:40.000000000 +0300 | + | --- oops-1.5.23.orig/src/lib/rwlock/rwlock.h 2003-10-06 17:15:40.000000000 +0300 |
| - | +++ oops-1.5.23/src/lib/rwlock/rwlock.h 2006-09-06 00:29:46.000000000 +0300 | + | +++ oops-1.5.23/src/lib/rwlock/rwlock.h 2006-09-06 00:29:46.000000000 +0300 |
| @@ -53,6 +53,7 @@ | @@ -53,6 +53,7 @@ | ||
| - | + | ||
| - | #if !defined(PTHREAD_RWLOCK_INITIALIZER) | + | #if !defined(PTHREAD_RWLOCK_INITIALIZER) |
| - | #define PTHREAD_RWLOCK_INITIALIZER NULL | + | #define PTHREAD_RWLOCK_INITIALIZER NULL |
| +#define OOPS_IMPLEMENT_RWLOCK 1 | +#define OOPS_IMPLEMENT_RWLOCK 1 | ||
| - | + | ||
| - | struct pthread_rwlock { | + | struct pthread_rwlock { |
| - | pthread_mutex_t lock; /* monitor lock */ | + | pthread_mutex_t lock; /* monitor lock */ |
| - | </code> | + | </file> |
patch_centos.1421860243.txt.gz · Last modified: 2015/01/21 17:10 by kyxap
