diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-15 17:00:29 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-15 17:00:29 +0200 |
| commit | 66b6357ea87d53d473537821968f5a4c806f9920 (patch) | |
| tree | c18bd04a9a2df7a6927f65dd1086ab97bdb87807 | |
| parent | 0fa2995defe8e1927c7d97879e78ca3a8fb65dfe (diff) | |
| parent | 6373941ad4dad080b7da05e9497fe0c43e9f5ec2 (diff) | |
| download | mariadb-git-66b6357ea87d53d473537821968f5a4c806f9920.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | ndb/include/ndb_global.h.in | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/configure.in b/configure.in index dff405d1493..5dc0e8b1e81 100644 --- a/configure.in +++ b/configure.in @@ -1946,7 +1946,7 @@ esac # isinf() could be a function or a macro (HPUX) AC_MSG_CHECKING(for isinf with <math.h>) -AC_TRY_LINK([#include <math.h>], [float f = 0.0; isinf(f)], +AC_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r], AC_MSG_RESULT(yes) AC_DEFINE(HAVE_ISINF, [1], [isinf() macro or function]), AC_MSG_RESULT(no)) diff --git a/ndb/include/ndb_global.h.in b/ndb/include/ndb_global.h.in index 43f90e1f8b5..122b0edc400 100644 --- a/ndb/include/ndb_global.h.in +++ b/ndb/include/ndb_global.h.in @@ -128,12 +128,8 @@ extern "C" { #include "ndb_init.h" -#ifdef SCO - #ifndef PATH_MAX #define PATH_MAX 1024 #endif -#endif /* SCO */ - #endif |