diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2013-07-24 21:35:51 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2013-07-24 21:35:51 +0000 |
| commit | dbf33b220e32ea0fcc980def5d68b36c4320c55e (patch) | |
| tree | 214f08cf604aa1371d83087d5f0de5f08d2a9193 /databases/db6 | |
| parent | e71757d25d6a3408683631f514f812e187650c43 (diff) | |
| download | ports-dbf33b220e32ea0fcc980def5d68b36c4320c55e.tar.gz ports-dbf33b220e32ea0fcc980def5d68b36c4320c55e.zip | |
Notes
Diffstat (limited to 'databases/db6')
| -rw-r--r-- | databases/db6/Makefile | 1 | ||||
| -rw-r--r-- | databases/db6/files/patch-src_dbinc_atomic.h | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/databases/db6/Makefile b/databases/db6/Makefile index db9e66eb1463..3fc5b0b62dad 100644 --- a/databases/db6/Makefile +++ b/databases/db6/Makefile @@ -84,6 +84,7 @@ CONFIGURE_ARGS+= --enable-debug --enable-umrw post-patch: ${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in + ${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_* post-install: .for i in libdb libdb_cxx libdb_stl ${libdb_sql} ${libdb_java} diff --git a/databases/db6/files/patch-src_dbinc_atomic.h b/databases/db6/files/patch-src_dbinc_atomic.h new file mode 100644 index 000000000000..cbe9ab66ecba --- /dev/null +++ b/databases/db6/files/patch-src_dbinc_atomic.h @@ -0,0 +1,20 @@ +--- ../src/dbinc/atomic.h.orig 2012-02-29 19:48:38.000000000 +0100 ++++ ../src/dbinc/atomic.h 2012-05-04 22:39:32.000000000 +0200 +@@ -70,7 +70,7 @@ typedef struct { + * These have no memory barriers; the caller must include them when necessary. + */ + #define atomic_read(p) ((p)->value) +-#define atomic_init(p, val) ((p)->value = (val)) ++#define db_atomic_init(p, val) ((p)->value = (val)) + + #ifdef HAVE_ATOMIC_SUPPORT + +@@ -206,7 +206,7 @@ static inline int __atomic_compare_excha + #define atomic_dec(env, p) (--(p)->value) + #define atomic_compare_exchange(env, p, oldval, newval) \ + (DB_ASSERT(env, atomic_read(p) == (oldval)), \ +- atomic_init(p, (newval)), 1) ++ db_atomic_init(p, (newval)), 1) + #else + #define atomic_inc(env, p) __atomic_inc(env, p) + #define atomic_dec(env, p) __atomic_dec(env, p) |