diff options
| author | unknown <tulin@build.mysql.com> | 2004-05-10 17:40:57 +0200 |
|---|---|---|
| committer | unknown <tulin@build.mysql.com> | 2004-05-10 17:40:57 +0200 |
| commit | 3c58a197b6cd36fa275ef281204ed9e5e5748abd (patch) | |
| tree | 808e79a60bd6ef6a37714172df3a6b1f8c06b1b3 /ndb/examples/ndbapi_async_example/ndbapi_async.cpp | |
| parent | 3ff2fcc9f11c796a610eae8e0584d082e3f5067c (diff) | |
| parent | d092cfb1c18ab8e48e462d26f3c751dc5e0e573b (diff) | |
| download | mariadb-git-3c58a197b6cd36fa275ef281204ed9e5e5748abd.tar.gz | |
merge resolve
extra/perror.c:
Auto merged
ndb/include/debugger/SignalLoggerManager.hpp:
Auto merged
ndb/include/ndb_version.h:
Auto merged
ndb/src/common/portlib/unix/NdbMem.c:
Auto merged
ndb/src/common/portlib/unix/NdbThread.c:
Auto merged
ndb/src/common/util/Parser.cpp:
Auto merged
ndb/src/common/util/getarg.c:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
Auto merged
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
Auto merged
ndb/src/mgmapi/test/keso.c:
Auto merged
ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'ndb/examples/ndbapi_async_example/ndbapi_async.cpp')
| -rw-r--r-- | ndb/examples/ndbapi_async_example/ndbapi_async.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/ndb/examples/ndbapi_async_example/ndbapi_async.cpp b/ndb/examples/ndbapi_async_example/ndbapi_async.cpp index 685c853c5d5..7abebcc832d 100644 --- a/ndb/examples/ndbapi_async_example/ndbapi_async.cpp +++ b/ndb/examples/ndbapi_async_example/ndbapi_async.cpp @@ -63,20 +63,12 @@ */ +#include <ndb_global.h> + #include <NdbApi.hpp> #include <NdbScanFilter.hpp> #include <iostream> // Used for cout -#ifdef SOLARIS -#include <sys/types.h> -#include <unistd.h> -#endif - -#if defined LINUX || defined MACOSX -#include <time.h> -#include <unistd.h> -#endif - /** * Helper sleep function */ |