diff options
author | unknown <wax@mysql.com> | 2004-06-08 12:44:02 +0600 |
---|---|---|
committer | unknown <wax@mysql.com> | 2004-06-08 12:44:02 +0600 |
commit | 8ac2f605acad62d912e5efa2817754ac264642e6 (patch) | |
tree | dcd6f0ef170e527b43d92361587534dd4eff4c49 /ndb/include/util | |
parent | 9ff3f0feaace8286cdf78ef206cf3721bc7c2bc9 (diff) | |
parent | 8a2b50c4a1744c23e44436020cbc3bbf286311bd (diff) | |
download | mariadb-git-8ac2f605acad62d912e5efa2817754ac264642e6.tar.gz |
Merge mysql.com:/home/wax/mysql/mysql-5.0
into mysql.com:/home/wax/mysql/mysql-5.0service
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'ndb/include/util')
-rw-r--r-- | ndb/include/util/BaseString.hpp | 4 | ||||
-rw-r--r-- | ndb/include/util/Bitmask.hpp | 5 | ||||
-rw-r--r-- | ndb/include/util/File.hpp | 17 | ||||
-rw-r--r-- | ndb/include/util/InputStream.hpp | 2 | ||||
-rw-r--r-- | ndb/include/util/NdbAutoPtr.hpp | 2 | ||||
-rw-r--r-- | ndb/include/util/NdbString.h | 48 | ||||
-rw-r--r-- | ndb/include/util/OutputStream.hpp | 2 | ||||
-rw-r--r-- | ndb/include/util/Properties.hpp | 5 | ||||
-rw-r--r-- | ndb/include/util/SimpleProperties.hpp | 3 | ||||
-rw-r--r-- | ndb/include/util/UtilBuffer.hpp | 4 | ||||
-rw-r--r-- | ndb/include/util/Vector.hpp | 3 | ||||
-rw-r--r-- | ndb/include/util/getarg.h | 2 | ||||
-rw-r--r-- | ndb/include/util/socket_io.h | 3 | ||||
-rw-r--r-- | ndb/include/util/uucode.h | 2 |
14 files changed, 21 insertions, 81 deletions
diff --git a/ndb/include/util/BaseString.hpp b/ndb/include/util/BaseString.hpp index a88bd97ffc5..75a1c291594 100644 --- a/ndb/include/util/BaseString.hpp +++ b/ndb/include/util/BaseString.hpp @@ -17,9 +17,7 @@ #ifndef __UTIL_BASESTRING_HPP_INCLUDED__ #define __UTIL_BASESTRING_HPP_INCLUDED__ -#include <ctype.h> -#include <stdlib.h> - +#include <ndb_global.h> #include <Vector.hpp> /** diff --git a/ndb/include/util/Bitmask.hpp b/ndb/include/util/Bitmask.hpp index 1f95d62bcb6..ed981743512 100644 --- a/ndb/include/util/Bitmask.hpp +++ b/ndb/include/util/Bitmask.hpp @@ -17,12 +17,9 @@ #ifndef NDB_BITMASK_H #define NDB_BITMASK_H -#include <ndb_types.h> -#include <NdbConstant.hpp> +#include <ndb_global.h> #ifndef NDB_ASSERT -#include <stdio.h> -#include <stdlib.h> #define NDB_ASSERT(x, s) \ do { if (!(x)) { printf("%s\n", s); abort(); } } while (0) #endif diff --git a/ndb/include/util/File.hpp b/ndb/include/util/File.hpp index fe3d2642b18..3ed0ad7a6f9 100644 --- a/ndb/include/util/File.hpp +++ b/ndb/include/util/File.hpp @@ -17,8 +17,7 @@ #ifndef FILE_H #define FILE_H -#include <NdbStdio.h> -#include <NdbConstant.hpp> +#include <ndb_global.h> /** * This class provides a file abstraction . It has operations @@ -26,7 +25,7 @@ * * @version #@ $Id: File.hpp,v 1.5 2002/04/26 13:15:38 ejonore Exp $ */ -class File +class File_class { public: /** @@ -65,7 +64,7 @@ public: /** * Default constructor. */ - File(); + File_class(); /** * Creates a new File with the specified filename and file mode. @@ -76,12 +75,12 @@ public: * @param aFileName a filename. * @param mode the mode which the file should be opened/created with, default "r". */ - File(const char* aFileName, const char* mode = "r"); + File_class(const char* aFileName, const char* mode = "r"); /** * Destructor. */ - ~File(); + ~File_class(); /** * Opens/creates the file. If open() fails then 'errno' and perror() @@ -198,9 +197,9 @@ private: char m_fileName[MAX_FILE_NAME_SIZE]; const char* m_fileMode; /* Prohibit */ - File(const File& aCopy); - File operator = (const File&); - bool operator == (const File&); + File_class (const File_class& aCopy); + File_class operator = (const File_class&); + bool operator == (const File_class&); }; #endif diff --git a/ndb/include/util/InputStream.hpp b/ndb/include/util/InputStream.hpp index 6b4cf262db4..b2a56b1e433 100644 --- a/ndb/include/util/InputStream.hpp +++ b/ndb/include/util/InputStream.hpp @@ -17,7 +17,7 @@ #ifndef INPUT_STREAM_HPP #define INPUT_STREAM_HPP -#include <stdio.h> +#include <ndb_global.h> #include <NdbTCP.h> /** diff --git a/ndb/include/util/NdbAutoPtr.hpp b/ndb/include/util/NdbAutoPtr.hpp index 2078714d98d..c01650ffc7e 100644 --- a/ndb/include/util/NdbAutoPtr.hpp +++ b/ndb/include/util/NdbAutoPtr.hpp @@ -17,7 +17,7 @@ #ifndef __NDB_AUTO_PTR_HPP #define __NDB_AUTO_PTR_HPP -#include <stdlib.h> +#include <ndb_global.h> template<typename T> class NdbAutoPtr { diff --git a/ndb/include/util/NdbString.h b/ndb/include/util/NdbString.h deleted file mode 100644 index 97646f813ac..00000000000 --- a/ndb/include/util/NdbString.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (C) 2003 MySQL AB - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#ifndef __NDBSTRING_H_INCLUDED__ -#define __NDBSTRING_H_INCLUDED__ - -#include <sys/types.h> -#include <string.h> - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef HAVE_STRDUP -extern char * strdup(const char *s); -#endif - -#ifndef HAVE_STRLCPY -extern size_t strlcpy (char *dst, const char *src, size_t dst_sz); -#endif - -#ifndef HAVE_STRLCAT -extern size_t strlcat (char *dst, const char *src, size_t dst_sz); -#endif - -#ifndef HAVE_STRCASECMP -extern int strcasecmp(const char *s1, const char *s2); -extern int strncasecmp(const char *s1, const char *s2, size_t n); -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* !__NDBSTRING_H_INCLUDED__ */ diff --git a/ndb/include/util/OutputStream.hpp b/ndb/include/util/OutputStream.hpp index 9d33ead7eb9..c7e009d4537 100644 --- a/ndb/include/util/OutputStream.hpp +++ b/ndb/include/util/OutputStream.hpp @@ -17,7 +17,7 @@ #ifndef OUTPUT_STREAM_HPP #define OUTPUT_STREAM_HPP -#include <stdio.h> +#include <ndb_global.h> #include <NdbTCP.h> /** diff --git a/ndb/include/util/Properties.hpp b/ndb/include/util/Properties.hpp index dbdc5f2b480..ff5d1338c79 100644 --- a/ndb/include/util/Properties.hpp +++ b/ndb/include/util/Properties.hpp @@ -17,10 +17,7 @@ #ifndef PROPERTIES_HPP #define PROPERTIES_HPP -#include <stdio.h> -#include <string.h> -#include <stdlib.h> -#include <ndb_types.h> +#include <ndb_global.h> #include <BaseString.hpp> #include <UtilBuffer.hpp> diff --git a/ndb/include/util/SimpleProperties.hpp b/ndb/include/util/SimpleProperties.hpp index 37e28ea91d8..d5ebb16bb09 100644 --- a/ndb/include/util/SimpleProperties.hpp +++ b/ndb/include/util/SimpleProperties.hpp @@ -17,8 +17,7 @@ #ifndef SIMPLE_PROPERTIES_HPP #define SIMPLE_PROPERTIES_HPP -#include <ndb_types.h> -#include <stddef.h> // offsetof +#include <ndb_global.h> #include <NdbOut.hpp> /** diff --git a/ndb/include/util/UtilBuffer.hpp b/ndb/include/util/UtilBuffer.hpp index 97821ee3f9b..b357fa0fdf2 100644 --- a/ndb/include/util/UtilBuffer.hpp +++ b/ndb/include/util/UtilBuffer.hpp @@ -17,9 +17,7 @@ #ifndef __BUFFER_HPP_INCLUDED__ #define __BUFFER_HPP_INCLUDED__ -#include <unistd.h> -#include <errno.h> -#include <stdlib.h> +#include <ndb_global.h> /* This class represents a buffer of binary data, where you can append * data at the end, and later read the entire bunch. diff --git a/ndb/include/util/Vector.hpp b/ndb/include/util/Vector.hpp index a717dfecd7e..f60817dab67 100644 --- a/ndb/include/util/Vector.hpp +++ b/ndb/include/util/Vector.hpp @@ -17,9 +17,8 @@ #ifndef NDB_VECTOR_HPP #define NDB_VECTOR_HPP -#include <stdlib.h> +#include <ndb_global.h> #include <NdbMutex.h> -#include <string.h> template<class T> struct Vector { diff --git a/ndb/include/util/getarg.h b/ndb/include/util/getarg.h index 713cf6e4b32..03ed25f6828 100644 --- a/ndb/include/util/getarg.h +++ b/ndb/include/util/getarg.h @@ -52,7 +52,7 @@ #ifndef __GETARG_H__ #define __GETARG_H__ -#include <stddef.h> +#include <ndb_global.h> #ifdef __cplusplus extern "C" { diff --git a/ndb/include/util/socket_io.h b/ndb/include/util/socket_io.h index bbd1bf115ae..a0e6c4e369d 100644 --- a/ndb/include/util/socket_io.h +++ b/ndb/include/util/socket_io.h @@ -17,8 +17,9 @@ #ifndef _SOCKET_IO_H #define _SOCKET_IO_H +#include <ndb_global.h> + #include <NdbTCP.h> -#include <stdarg.h> #ifdef __cplusplus extern "C" { diff --git a/ndb/include/util/uucode.h b/ndb/include/util/uucode.h index 138a79fa3ae..f5569d033a5 100644 --- a/ndb/include/util/uucode.h +++ b/ndb/include/util/uucode.h @@ -17,7 +17,7 @@ #ifndef UUCODE_H #define UUCODE_H -#include <stdio.h> +#include <ndb_global.h> #ifdef __cplusplus extern "C" { |