mirror of
https://github.com/MariaDB/server.git
synced 2025-12-01 17:39:21 +03:00
abstract stdint.h for solaris. addresses #1789
git-svn-id: file:///svn/toku/tokudb@12569 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
committed by
Yoni Fogel
parent
848a96a64c
commit
1ea7ce00b4
1
freebsd/toku_stdint.h
Symbolic link
1
freebsd/toku_stdint.h
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../linux/toku_stdint.h
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <sys/resource.h>
|
#include <sys/resource.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <toku_portability.h>
|
#include "toku_portability.h"
|
||||||
#include "toku_os.h"
|
#include "toku_os.h"
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdint.h>
|
#include <toku_stdint.h>
|
||||||
#include <inttypes.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdint.h>
|
#include <toku_stdint.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include "toku_os.h"
|
#include "toku_os.h"
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdint.h>
|
#include <toku_stdint.h>
|
||||||
#include <inttypes.h>
|
|
||||||
#include <toku_os.h>
|
#include <toku_os.h>
|
||||||
|
|
||||||
const int nbuffers = 1000;
|
const int nbuffers = 1000;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdint.h>
|
#include <toku_stdint.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include "toku_os.h"
|
#include "toku_os.h"
|
||||||
|
|||||||
8
linux/toku_stdint.h
Normal file
8
linux/toku_stdint.h
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
#ifndef TOKU_STDINT_H
|
||||||
|
#define TOKU_STDINT_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <inttypes.h>
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
|
#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
|
||||||
|
|
||||||
// Portability first!
|
// Portability first!
|
||||||
#include "stdint.h"
|
#include "toku_stdint.h"
|
||||||
#include <toku_portability.h>
|
#include <toku_portability.h>
|
||||||
#include "toku_os.h"
|
#include "toku_os.h"
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
#include <locktree.h>
|
#include <locktree.h>
|
||||||
#include <ydb-internal.h>
|
#include <ydb-internal.h>
|
||||||
#include <brt-internal.h>
|
#include <brt-internal.h>
|
||||||
#include <stdint.h>
|
#include <toku_stdint.h>
|
||||||
|
|
||||||
/* TODO: Yoni should check that all asserts make sense instead of panic,
|
/* TODO: Yoni should check that all asserts make sense instead of panic,
|
||||||
and all early returns make sense instead of panic,
|
and all early returns make sense instead of panic,
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdint.h>
|
#include <toku_stdint.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
typedef toku_range *OMTVALUE;
|
typedef toku_range *OMTVALUE;
|
||||||
#include "../../newbrt/omt.h"
|
#include "../../newbrt/omt.h"
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdint.h>
|
#include <toku_stdint.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <db.h>
|
#include <db.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdint.h>
|
#include <toku_stdint.h>
|
||||||
#include <toku_portability.h>
|
#include <toku_portability.h>
|
||||||
#include <db.h>
|
#include <db.h>
|
||||||
#include "ydb.h"
|
#include "ydb.h"
|
||||||
|
|||||||
@@ -26,8 +26,7 @@ extern "C" {
|
|||||||
#define __attribute__(x) /* Nothing */
|
#define __attribute__(x) /* Nothing */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "stdint.h"
|
#include "toku_stdint.h"
|
||||||
#include "inttypes.h"
|
|
||||||
|
|
||||||
#ifndef TOKU_OFF_T_DEFINED
|
#ifndef TOKU_OFF_T_DEFINED
|
||||||
#define TOKU_OFF_T_DEFINED
|
#define TOKU_OFF_T_DEFINED
|
||||||
@@ -47,9 +46,7 @@ typedef int64_t toku_off_t;
|
|||||||
#if defined(__ICC)
|
#if defined(__ICC)
|
||||||
// Intel linux
|
// Intel linux
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <toku_stdint.h>
|
||||||
#include <inttypes.h>
|
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
@@ -59,8 +56,7 @@ typedef int64_t toku_off_t;
|
|||||||
#elif defined(__GNUC__)
|
#elif defined(__GNUC__)
|
||||||
// GCC linux
|
// GCC linux
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <toku_stdint.h>
|
||||||
#include <inttypes.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
|||||||
8
windows/toku_stdint.h
Normal file
8
windows/toku_stdint.h
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
#ifndef TOKU_STDINT_H
|
||||||
|
#define TOKU_STDINT_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <inttypes.h>
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
Reference in New Issue
Block a user