diff options
| author | lenz@mysql.com <> | 2002-12-23 14:36:40 +0100 |
|---|---|---|
| committer | lenz@mysql.com <> | 2002-12-23 14:36:40 +0100 |
| commit | c0ed25283f29498f2cfd4dd3fa7cabd5558e5a4d (patch) | |
| tree | 3bd92d59925233a3d96867614e50c49768219396 /bdb | |
| parent | 446b9c0768628143e0a52b66ede392823aa89b71 (diff) | |
| download | mariadb-git-c0ed25283f29498f2cfd4dd3fa7cabd5558e5a4d.tar.gz | |
- Applied various patches provided by Christian Hammers (MySQL maintainer
for the Debian project) to fix some architecture-specific problems
and some bugs
Diffstat (limited to 'bdb')
| -rw-r--r-- | bdb/dist/aclocal/mutex.m4 | 2 | ||||
| -rw-r--r-- | bdb/include/mutex.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bdb/dist/aclocal/mutex.m4 b/bdb/dist/aclocal/mutex.m4 index 5c9218da163..2010670599f 100644 --- a/bdb/dist/aclocal/mutex.m4 +++ b/bdb/dist/aclocal/mutex.m4 @@ -279,7 +279,7 @@ fi dnl Sparc/gcc: SunOS, Solaris dnl The sparc/gcc code doesn't always work, specifically, I've seen assembler dnl failures from the stbar instruction on SunOS 4.1.4/sun4c and gcc 2.7.2.2. -if test "$db_cv_mutex" = DOESNT_WORK; then +if test "$db_cv_mutex" = no; then AC_TRY_RUN([main(){ #if defined(__sparc__) #if defined(__GNUC__) diff --git a/bdb/include/mutex.h b/bdb/include/mutex.h index 4c1b265355d..9f341695cbf 100644 --- a/bdb/include/mutex.h +++ b/bdb/include/mutex.h @@ -327,7 +327,7 @@ typedef unsigned char tsl_t; */ #define MUTEX_SET(tsl) ({ \ register tsl_t *__l = (tsl); \ - int __r; \ + unsigned char __r; \ asm volatile("tas %1; \n \ seq %0" \ : "=dm" (__r), "=m" (*__l) \ |