Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
24ceb874
Commit
24ceb874
authored
Jan 04, 2005
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes ndb types include
parent
2707d22f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
104 additions
and
29 deletions
+104
-29
configure.in
configure.in
+18
-1
ndb/include/ndb_global.h.in
ndb/include/ndb_global.h.in
+5
-28
ndb/include/ndb_types.h.in
ndb/include/ndb_types.h.in
+81
-0
No files found.
configure.in
View file @
24ceb874
...
@@ -1770,6 +1770,7 @@ examine config.log for possible errors. If you want to report this, use
...
@@ -1770,6 +1770,7 @@ examine config.log for possible errors. If you want to report this, use
'scripts/mysqlbug' and include at least the last 20 rows from config.log!])
'scripts/mysqlbug' and include at least the last 20 rows from config.log!])
fi
fi
AC_CHECK_SIZEOF(char*, 4)
AC_CHECK_SIZEOF(char*, 4)
AC_CHECK_SIZEOF(short, 2)
AC_CHECK_SIZEOF(int, 4)
AC_CHECK_SIZEOF(int, 4)
if test "
$ac_cv_sizeof_int
" -eq 0
if test "
$ac_cv_sizeof_int
" -eq 0
then
then
...
@@ -2723,11 +2724,26 @@ then
...
@@ -2723,11 +2724,26 @@ then
fi
fi
AC_SUBST
([
ndb_bin_am_ldflags]
)
AC_SUBST
([
ndb_bin_am_ldflags]
)
AC_SUBST
([
ndb_opt_subdirs]
)
AC_SUBST
([
ndb_opt_subdirs]
)
NDB_SIZEOF_CHARP
=
"
$ac_cv_sizeof_charp
"
NDB_SIZEOF_CHAR
=
"
$ac_cv_sizeof_char
"
NDB_SIZEOF_SHORT
=
"
$ac_cv_sizeof_short
"
NDB_SIZEOF_INT
=
"
$ac_cv_sizeof_int
"
NDB_SIZEOF_LONG
=
"
$ac_cv_sizeof_long
"
NDB_SIZEOF_LONG_LONG
=
"
$ac_cv_sizeof_long_long
"
AC_SUBST
([
NDB_SIZEOF_CHARP]
)
AC_SUBST
([
NDB_SIZEOF_CHAR]
)
AC_SUBST
([
NDB_SIZEOF_SHORT]
)
AC_SUBST
([
NDB_SIZEOF_INT]
)
AC_SUBST
([
NDB_SIZEOF_LONG]
)
AC_SUBST
([
NDB_SIZEOF_LONG_LONG]
)
AC_CONFIG_FILES
(
ndb/Makefile ndb/include/Makefile dnl
AC_CONFIG_FILES
(
ndb/Makefile ndb/include/Makefile dnl
ndb/src/Makefile ndb/src/common/Makefile dnl
ndb/src/Makefile ndb/src/common/Makefile dnl
ndb/docs/Makefile dnl
ndb/docs/Makefile dnl
ndb/tools/Makefile dnl
ndb/tools/Makefile dnl
ndb/src/common/debugger/Makefile ndb/src/common/debugger/signaldata/Makefile dnl
ndb/src/common/debugger/Makefile dnl
ndb/src/common/debugger/signaldata/Makefile dnl
ndb/src/common/portlib/Makefile dnl
ndb/src/common/portlib/Makefile dnl
ndb/src/common/util/Makefile dnl
ndb/src/common/util/Makefile dnl
ndb/src/common/logger/Makefile dnl
ndb/src/common/logger/Makefile dnl
...
@@ -2766,6 +2782,7 @@ AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl
...
@@ -2766,6 +2782,7 @@ AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl
ndb/test/tools/Makefile dnl
ndb/test/tools/Makefile dnl
ndb/test/run-test/Makefile mysql-test/ndb/Makefile dnl
ndb/test/run-test/Makefile mysql-test/ndb/Makefile dnl
ndb/include/ndb_version.h ndb/include/ndb_global.h dnl
ndb/include/ndb_version.h ndb/include/ndb_global.h dnl
ndb/include/ndb_types.h dnl
)
)
fi
fi
...
...
ndb/include/ndb_global.h.in
View file @
24ceb874
...
@@ -14,8 +14,8 @@
...
@@ -14,8 +14,8 @@
along with this program; if not, write to the Free Software
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifndef NDBGLOBAL_H
#ifndef NDB
_
GLOBAL_H
#define NDBGLOBAL_H
#define NDB
_
GLOBAL_H
#include <ndb_types.h>
#include <ndb_types.h>
...
@@ -31,45 +31,22 @@
...
@@ -31,45 +31,22 @@
#define HAVE_STRCASECMP
#define HAVE_STRCASECMP
#define strcasecmp _strcmpi
#define strcasecmp _strcmpi
#pragma warning(disable: 4503 4786)
#pragma warning(disable: 4503 4786)
typedef unsigned __int64 Uint64;
typedef signed __int64 Int64;
#else
#else
#undef NDB_WIN32
#undef NDB_WIN32
#define DIR_SEPARATOR "/"
#define DIR_SEPARATOR "/"
typedef unsigned long long Uint64;
typedef signed long long Int64;
#endif
#endif
#include <my_global.h>
#include <my_global.h>
typedef signed char Int8;
#if ! (NDB_SIZEOF_CHAR == SIZEOF_CHAR)
typedef unsigned char Uint8;
typedef signed short Int16;
typedef unsigned short Uint16;
typedef signed int Int32;
typedef unsigned int Uint32;
typedef unsigned int UintR;
#ifdef __SIZE_TYPE__
typedef __SIZE_TYPE__ UintPtr;
#elif SIZEOF_CHARP == 4
typedef Uint32 UintPtr;
#elif SIZEOF_CHARP == 8
typedef Uint64 UintPtr;
#else
#error "Unknown size of (char *)"
#endif
#if ! (SIZEOF_CHAR == 1)
#error "Invalid define for Uint8"
#error "Invalid define for Uint8"
#endif
#endif
#if ! (
SIZEOF_INT == 4
)
#if ! (
NDB_SIZEOF_INT == SIZEOF_INT
)
#error "Invalid define for Uint32"
#error "Invalid define for Uint32"
#endif
#endif
#if ! (
SIZEOF_LONG_LONG == 8
)
#if ! (
NDB_SIZEOF_LONG_LONG == SIZEOF_LONG_LONG
)
#error "Invalid define for Uint64"
#error "Invalid define for Uint64"
#endif
#endif
...
...
ndb/include/ndb_types.h
→
ndb/include/ndb_types.h
.in
View file @
24ceb874
...
@@ -21,7 +21,61 @@
...
@@ -21,7 +21,61 @@
#ifndef NDB_TYPES_H
#ifndef NDB_TYPES_H
#define NDB_TYPES_H
#define NDB_TYPES_H
#include "ndb_global.h"
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(_WIN64)
#define NDB_SIZEOF_CHARP SIZEOF_CHARP
#define NDB_SIZEOF_CHAR SIZEOF_CHAR
#define NDB_SIZEOF_SHORT 2
#define NDB_SIZEOF_INT SIZEOF_INT
#define NDB_SIZEOF_LONG SIZEOF_LONG
#define NDB_SIZEOF_LONG_LONG SIZEOF_LONG_LONG
typedef unsigned __int64 Uint64;
typedef signed __int64 Int64;
#else
#define NDB_SIZEOF_CHARP @NDB_SIZEOF_CHARP@
#define NDB_SIZEOF_CHAR @NDB_SIZEOF_CHAR@
#define NDB_SIZEOF_INT @NDB_SIZEOF_INT@
#define NDB_SIZEOF_SHORT @NDB_SIZEOF_SHORT@
#define NDB_SIZEOF_LONG @NDB_SIZEOF_LONG@
#define NDB_SIZEOF_LONG_LONG @NDB_SIZEOF_LONG_LONG@
typedef unsigned long long Uint64;
typedef signed long long Int64;
#endif
typedef signed char Int8;
typedef unsigned char Uint8;
typedef signed short Int16;
typedef unsigned short Uint16;
typedef signed int Int32;
typedef unsigned int Uint32;
typedef unsigned int UintR;
#ifdef __SIZE_TYPE__
typedef __SIZE_TYPE__ UintPtr;
#elif NDB_SIZEOF_CHARP == 4
typedef Uint32 UintPtr;
#elif NDB_SIZEOF_CHARP == 8
typedef Uint64 UintPtr;
#else
#error "Unknown size of (char *)"
#endif
#if ! (NDB_SIZEOF_CHAR == 1)
#error "Invalid define for Uint8"
#endif
#if ! (NDB_SIZEOF_SHORT == 2)
#error "Invalid define for Uint16"
#endif
#if ! (NDB_SIZEOF_INT == 4)
#error "Invalid define for Uint32"
#endif
#if ! (NDB_SIZEOF_LONG_LONG == 8)
#error "Invalid define for Uint64"
#endif
#include "ndb_constants.h"
#include "ndb_constants.h"
#endif
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment