Addresses #1519 Linux port of 'poison off_t' in windows

git-svn-id: file:///svn/toku/tokudb@9784 c7de825b-a66e-492c-adef-691d508d4ae1
2025-01-22 06:44:16 +01:00 · 2013-04-16 23:57:43 -04:00 · 2013-04-16 23:57:43 -04:00 · 315770b1ac
commit 315770b1ac
parent e50cfa1034
8 changed files with 38 additions and 5 deletions
--- a/buildheader/db.h_4_1
+++ b/buildheader/db.h_4_1
@ -17,6 +17,10 @@ extern "C" {
 #else
 #define DB_VERSION_STRING_ydb "Tokutek: TokuDB (wrapped bdb)"
 #endif
+#ifndef TOKU_OFF_T_DEFINED
+#define TOKU_OFF_T_DEFINED
+typedef int64_t toku_off_t;
+#endif
 typedef struct __toku_db_btree_stat DB_BTREE_STAT;
 typedef struct __toku_db_env DB_ENV;
 typedef struct __toku_db_key_range DB_KEY_RANGE;
@ -297,7 +301,7 @@ int toku_set_trace_file (char *fname) __attribute__((__visibility__("default")))
 int toku_close_trace_file (void) __attribute__((__visibility__("default")));
 int db_env_set_func_free (void (*)(void*)) __attribute__((__visibility__("default")));
 int db_env_set_func_malloc (void *(*)(size_t)) __attribute__((__visibility__("default")));
-int db_env_set_func_pwrite (ssize_t (*)(int, const void *, size_t, off_t)) __attribute__((__visibility__("default")));
+int db_env_set_func_pwrite (ssize_t (*)(int, const void *, size_t, toku_off_t)) __attribute__((__visibility__("default")));
 int db_env_set_func_write (ssize_t (*)(int, const void *, size_t)) __attribute__((__visibility__("default")));
 int db_env_set_func_realloc (void *(*)(void*, size_t)) __attribute__((__visibility__("default")));
 #if defined(__cplusplus)
--- a/buildheader/db.h_4_3
+++ b/buildheader/db.h_4_3
@ -17,6 +17,10 @@ extern "C" {
 #else
 #define DB_VERSION_STRING_ydb "Tokutek: TokuDB (wrapped bdb)"
 #endif
+#ifndef TOKU_OFF_T_DEFINED
+#define TOKU_OFF_T_DEFINED
+typedef int64_t toku_off_t;
+#endif
 typedef struct __toku_db_btree_stat DB_BTREE_STAT;
 typedef struct __toku_db_env DB_ENV;
 typedef struct __toku_db_key_range DB_KEY_RANGE;
@ -313,7 +317,7 @@ int toku_set_trace_file (char *fname) __attribute__((__visibility__("default")))
 int toku_close_trace_file (void) __attribute__((__visibility__("default")));
 int db_env_set_func_free (void (*)(void*)) __attribute__((__visibility__("default")));
 int db_env_set_func_malloc (void *(*)(size_t)) __attribute__((__visibility__("default")));
-int db_env_set_func_pwrite (ssize_t (*)(int, const void *, size_t, off_t)) __attribute__((__visibility__("default")));
+int db_env_set_func_pwrite (ssize_t (*)(int, const void *, size_t, toku_off_t)) __attribute__((__visibility__("default")));
 int db_env_set_func_write (ssize_t (*)(int, const void *, size_t)) __attribute__((__visibility__("default")));
 int db_env_set_func_realloc (void *(*)(void*, size_t)) __attribute__((__visibility__("default")));
 #if defined(__cplusplus)
--- a/buildheader/db.h_4_4
+++ b/buildheader/db.h_4_4
@ -17,6 +17,10 @@ extern "C" {
 #else
 #define DB_VERSION_STRING_ydb "Tokutek: TokuDB (wrapped bdb)"
 #endif
+#ifndef TOKU_OFF_T_DEFINED
+#define TOKU_OFF_T_DEFINED
+typedef int64_t toku_off_t;
+#endif
 typedef struct __toku_db_btree_stat DB_BTREE_STAT;
 typedef struct __toku_db_env DB_ENV;
 typedef struct __toku_db_key_range DB_KEY_RANGE;
@ -320,7 +324,7 @@ int toku_set_trace_file (char *fname) __attribute__((__visibility__("default")))
 int toku_close_trace_file (void) __attribute__((__visibility__("default")));
 int db_env_set_func_free (void (*)(void*)) __attribute__((__visibility__("default")));
 int db_env_set_func_malloc (void *(*)(size_t)) __attribute__((__visibility__("default")));
-int db_env_set_func_pwrite (ssize_t (*)(int, const void *, size_t, off_t)) __attribute__((__visibility__("default")));
+int db_env_set_func_pwrite (ssize_t (*)(int, const void *, size_t, toku_off_t)) __attribute__((__visibility__("default")));
 int db_env_set_func_write (ssize_t (*)(int, const void *, size_t)) __attribute__((__visibility__("default")));
 int db_env_set_func_realloc (void *(*)(void*, size_t)) __attribute__((__visibility__("default")));
 #if defined(__cplusplus)
--- a/buildheader/db.h_4_5
+++ b/buildheader/db.h_4_5
@ -17,6 +17,10 @@ extern "C" {
 #else
 #define DB_VERSION_STRING_ydb "Tokutek: TokuDB (wrapped bdb)"
 #endif
+#ifndef TOKU_OFF_T_DEFINED
+#define TOKU_OFF_T_DEFINED
+typedef int64_t toku_off_t;
+#endif
 typedef struct __toku_db_btree_stat DB_BTREE_STAT;
 typedef struct __toku_db_env DB_ENV;
 typedef struct __toku_db_key_range DB_KEY_RANGE;
@ -320,7 +324,7 @@ int toku_set_trace_file (char *fname) __attribute__((__visibility__("default")))
 int toku_close_trace_file (void) __attribute__((__visibility__("default")));
 int db_env_set_func_free (void (*)(void*)) __attribute__((__visibility__("default")));
 int db_env_set_func_malloc (void *(*)(size_t)) __attribute__((__visibility__("default")));
-int db_env_set_func_pwrite (ssize_t (*)(int, const void *, size_t, off_t)) __attribute__((__visibility__("default")));
+int db_env_set_func_pwrite (ssize_t (*)(int, const void *, size_t, toku_off_t)) __attribute__((__visibility__("default")));
 int db_env_set_func_write (ssize_t (*)(int, const void *, size_t)) __attribute__((__visibility__("default")));
 int db_env_set_func_realloc (void *(*)(void*, size_t)) __attribute__((__visibility__("default")));
 #if defined(__cplusplus)
--- a/buildheader/db.h_4_6
+++ b/buildheader/db.h_4_6
@ -17,6 +17,10 @@ extern "C" {
 #else
 #define DB_VERSION_STRING_ydb "Tokutek: TokuDB (wrapped bdb)"
 #endif
+#ifndef TOKU_OFF_T_DEFINED
+#define TOKU_OFF_T_DEFINED
+typedef int64_t toku_off_t;
+#endif
 typedef struct __toku_db_btree_stat DB_BTREE_STAT;
 typedef struct __toku_db_env DB_ENV;
 typedef struct __toku_db_key_range DB_KEY_RANGE;
@ -325,7 +329,7 @@ int toku_set_trace_file (char *fname) __attribute__((__visibility__("default")))
 int toku_close_trace_file (void) __attribute__((__visibility__("default")));
 int db_env_set_func_free (void (*)(void*)) __attribute__((__visibility__("default")));
 int db_env_set_func_malloc (void *(*)(size_t)) __attribute__((__visibility__("default")));
-int db_env_set_func_pwrite (ssize_t (*)(int, const void *, size_t, off_t)) __attribute__((__visibility__("default")));
+int db_env_set_func_pwrite (ssize_t (*)(int, const void *, size_t, toku_off_t)) __attribute__((__visibility__("default")));
 int db_env_set_func_write (ssize_t (*)(int, const void *, size_t)) __attribute__((__visibility__("default")));
 int db_env_set_func_realloc (void *(*)(void*, size_t)) __attribute__((__visibility__("default")));
 #if defined(__cplusplus)
--- a/buildheader/make_db_h.c
+++ b/buildheader/make_db_h.c
@ -282,6 +282,12 @@ int main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__un
 	printf("#endif\n");
    }

+    //Typedef toku_off_t
+    printf("#ifndef TOKU_OFF_T_DEFINED\n"
+           "#define TOKU_OFF_T_DEFINED\n"
+           "typedef int64_t toku_off_t;\n"
+           "#endif\n");
+
    printf("typedef struct __toku_db_btree_stat DB_BTREE_STAT;\n");
    printf("typedef struct __toku_db_env DB_ENV;\n");
    printf("typedef struct __toku_db_key_range DB_KEY_RANGE;\n");
--- a/include/db.h
+++ b/include/db.h
@ -17,6 +17,10 @@ extern "C" {
 #else
 #define DB_VERSION_STRING_ydb "Tokutek: TokuDB (wrapped bdb)"
 #endif
+#ifndef TOKU_OFF_T_DEFINED
+#define TOKU_OFF_T_DEFINED
+typedef int64_t toku_off_t;
+#endif
 typedef struct __toku_db_btree_stat DB_BTREE_STAT;
 typedef struct __toku_db_env DB_ENV;
 typedef struct __toku_db_key_range DB_KEY_RANGE;
--- a/toku_include/toku_portability.h
+++ b/toku_include/toku_portability.h
@ -67,7 +67,10 @@ extern "C" {
 #include "toku_os.h"
 #include "toku_htonl.h"

+#ifndef TOKU_OFF_T_DEFINED
+#define TOKU_OFF_T_DEFINED
 typedef int64_t toku_off_t;
+#endif

 #define UU(x) x __attribute__((__unused__))