diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-06-10 15:55:00 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-06-10 15:55:00 +0300 |
| commit | aa5f42432c1223967412f12ea063dfe91526561b (patch) | |
| tree | 9b4fa2d2c7a8fab2cc64adbd020e949169a9d1bf /innobase/include | |
| parent | 9c0aa920ba0e053e52195610a1e37b091e1c3442 (diff) | |
| download | mariadb-git-aa5f42432c1223967412f12ea063dfe91526561b.tar.gz | |
InnoDB: Remove compiler warning
innobase/fil/fil0fil.c:
Move the declaration of fil_node_t to os0file.h.
Remove type casting from address-of operation
(which would break strict aliasing rules)
innobase/include/os0file.h:
Declare fil_node_t as an opaque structure.
Replace void* message1 with fil_node_t* message1.
innobase/os/os0file.c:
Replace void* message1 with fil_node_t* message1.
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/os0file.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/innobase/include/os0file.h b/innobase/include/os0file.h index 729ad81da9c..e75281dd93c 100644 --- a/innobase/include/os0file.h +++ b/innobase/include/os0file.h @@ -17,6 +17,8 @@ Created 10/21/1995 Heikki Tuuri #include <time.h> #endif +typedef struct fil_node_struct fil_node_t; + extern ibool os_do_not_call_flush_at_each_write; extern ibool os_has_said_disk_full; extern ibool os_aio_print_debug; @@ -563,7 +565,7 @@ os_aio( ulint offset_high, /* in: most significant 32 bits of offset */ ulint n, /* in: number of bytes to read or write */ - void* message1,/* in: messages for the aio handler (these + fil_node_t* message1,/* in: messages for the aio handler (these can be used to identify a completed aio operation); if mode is OS_AIO_SYNC, these are ignored */ @@ -621,7 +623,7 @@ os_aio_windows_handle( ignored */ ulint pos, /* this parameter is used only in sync aio: wait for the aio slot at this position */ - void** message1, /* out: the messages passed with the aio + fil_node_t**message1, /* out: the messages passed with the aio request; note that also in the case where the aio operation failed, these output parameters are valid and can be used to @@ -641,7 +643,7 @@ os_aio_posix_handle( /*================*/ /* out: TRUE if the aio operation succeeded */ ulint array_no, /* in: array number 0 - 3 */ - void** message1, /* out: the messages passed with the aio + fil_node_t**message1, /* out: the messages passed with the aio request; note that also in the case where the aio operation failed, these output parameters are valid and can be used to @@ -661,7 +663,7 @@ os_aio_simulated_handle( i/o thread, segment 1 the log i/o thread, then follow the non-ibuf read threads, and as the last are the non-ibuf write threads */ - void** message1, /* out: the messages passed with the aio + fil_node_t**message1, /* out: the messages passed with the aio request; note that also in the case where the aio operation failed, these output parameters are valid and can be used to |