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
6e1ba884
Commit
6e1ba884
authored
Jan 28, 2007
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move intptr from my_atomic.h to my_global.h
parent
2a8ee9fb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
include/my_atomic.h
include/my_atomic.h
+0
-8
include/my_global.h
include/my_global.h
+9
-1
No files found.
include/my_atomic.h
View file @
6e1ba884
...
...
@@ -134,14 +134,6 @@ make_atomic_swap(ptr)
#undef _atomic_h_cleanup_
#endif
#if SIZEOF_CHARP == SIZEOF_INT
typedef
int
intptr
;
#elif SIZEOF_CHARP == SIZEOF_LONG
typedef
long
intptr
;
#else
#error
#endif
#define MY_ATOMIC_OK 0
#define MY_ATOMIC_NOT_1CPU 1
extern
int
my_atomic_initialize
();
...
...
include/my_global.h
View file @
6e1ba884
...
...
@@ -987,7 +987,7 @@ typedef long int32;
typedef
unsigned
long
uint32
;
#endif
#else
#error
"Neither int or long is of 4 bytes width"
#error
Neither int or long is of 4 bytes width
#endif
#if !defined(HAVE_ULONG) && !defined(__USE_MISC)
...
...
@@ -1017,6 +1017,14 @@ typedef unsigned __int64 my_ulonglong;
typedef
unsigned
long
long
my_ulonglong
;
#endif
#if SIZEOF_CHARP == SIZEOF_INT
typedef
int
intptr
;
#elif SIZEOF_CHARP == SIZEOF_LONG
typedef
long
intptr
;
#else
#error sizeof(void *) is neither sizeof(int) nor sizeof(long)
#endif
#ifdef USE_RAID
/*
The following is done with a if to not get problems with pre-processors
...
...
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