diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-24 12:53:47 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-24 12:53:47 +0200 |
| commit | 8247821b387bdff641e2060381bd2b8dfd26362f (patch) | |
| tree | f49940b1731e72b01cbe18792f3d50b5e749da6b /extra | |
| parent | dd7dbb39aa723b438cdb11558b703876e369fd82 (diff) | |
| parent | 375b04b9fe8826bd666b49421b5176a9316039e8 (diff) | |
| download | mariadb-git-8247821b387bdff641e2060381bd2b8dfd26362f.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
include/mysql.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
netware/BUILD/compile-netware-END:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
vio/viossl.c:
Auto merged
vio/viosslfactories.c:
Auto merged
netware/BUILD/mwenv:
Merge
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/testsuite/test.hpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extra/yassl/testsuite/test.hpp b/extra/yassl/testsuite/test.hpp index 0266c802657..b23b36f0ba2 100644 --- a/extra/yassl/testsuite/test.hpp +++ b/extra/yassl/testsuite/test.hpp @@ -27,9 +27,12 @@ #endif /* _WIN32 */ -#if !defined(_SOCKLEN_T) && (defined(_WIN32) || defined(__NETWARE__)) +#if !defined(_SOCKLEN_T) && defined(_WIN32) typedef int socklen_t; #endif +#if !defined(_SOCKLEN_T) && defined(__NETWARE__) + typedef size_t socklen_t; +#endif // Check type of third arg to accept |