diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-17 16:46:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-17 16:46:34 +0300 |
| commit | f1159b18d930910d5b5b9c454a17b0ee66f853c3 (patch) | |
| tree | 67d9ac4fb191347f0fff24a4b2b1f0e9fceda319 /include | |
| parent | 60589aeee03949033c66da5c1eae70d4342179fc (diff) | |
| download | mariadb-git-f1159b18d930910d5b5b9c454a17b0ee66f853c3.tar.gz | |
More fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_getopt.h | 2 | ||||
| -rw-r--r-- | include/my_global.h | 2 | ||||
| -rw-r--r-- | include/my_valgrind.h | 2 | ||||
| -rw-r--r-- | include/violite.h | 4 |
4 files changed, 2 insertions, 8 deletions
diff --git a/include/my_getopt.h b/include/my_getopt.h index 61c4b054615..650f6300796 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -87,8 +87,6 @@ struct my_option typedef my_bool (*my_get_one_option)(int, const struct my_option *, char *); -typedef void (*my_error_reporter)(enum loglevel level, const char *format, ...) - ATTRIBUTE_FORMAT_FPTR(printf, 2, 3); /** Used to retrieve a reference to the object (variable) that holds the value diff --git a/include/my_global.h b/include/my_global.h index fa9ce649543..12a93bd7712 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1015,9 +1015,9 @@ typedef struct st_mysql_lex_string LEX_STRING; #define closesocket(A) close(A) #define SOCKET_EINTR EINTR #define SOCKET_EAGAIN EAGAIN -#define SOCKET_ETIMEDOUT SOCKET_EINTR #define SOCKET_EWOULDBLOCK EWOULDBLOCK #define SOCKET_EADDRINUSE EADDRINUSE +#define SOCKET_ETIMEDOUT ETIMEDOUT #define SOCKET_ECONNRESET ECONNRESET #define SOCKET_ENFILE ENFILE #define SOCKET_EMFILE EMFILE diff --git a/include/my_valgrind.h b/include/my_valgrind.h index 0aeaef68b50..d32b1f78e15 100644 --- a/include/my_valgrind.h +++ b/include/my_valgrind.h @@ -39,7 +39,7 @@ #ifndef DBUG_OFF #define TRASH_FILL(A,B,C) do { const size_t trash_tmp= (B) ; bfill(A, trash_tmp, C); MEM_UNDEFINED(A, trash_tmp); } while (0) #else -#define TRASH_FILL(A,B,C) do{ const size_t trash_tmp= (B) ; MEM_CHECK_ADDRESSABLE(A,trash_tmp);MEM_UNDEFINED(A,trash_tmp);} while (0) +#define TRASH_FILL(A,B,C) do{ const size_t trash_tmp __attribute((unused)) = (B) ; MEM_CHECK_ADDRESSABLE(A,trash_tmp);MEM_UNDEFINED(A,trash_tmp);} while (0) #endif #define TRASH_ALLOC(A,B) TRASH_FILL(A,B,0xA5) #define TRASH_FREE(A,B) TRASH_FILL(A,B,0x8F) diff --git a/include/violite.h b/include/violite.h index 838fc7ee096..661d07d5a3b 100644 --- a/include/violite.h +++ b/include/violite.h @@ -88,7 +88,6 @@ int vio_keepalive(Vio *vio, my_bool onoff); my_bool vio_should_retry(Vio *vio); /* Check that operation was timed out */ my_bool vio_was_timeout(Vio *vio); -my_bool vio_was_interrupted(Vio *vio); /* Short text description of the socket for those, who are curious.. */ const char* vio_description(Vio *vio); /* Return the type of the connection */ @@ -192,12 +191,10 @@ void vio_end(void); #define vio_keepalive(vio, set_keep_alive) (vio)->viokeepalive(vio, set_keep_alive) #define vio_should_retry(vio) (vio)->should_retry(vio) #define vio_was_timeout(vio) (vio)->was_timeout(vio) -#define vio_was_interrupted(vio) (vio)->was_interrupted(vio) #define vio_close(vio) ((vio)->vioclose)(vio) #define vio_shutdown(vio,how) ((vio)->shutdown)(vio,how) #define vio_peer_addr(vio, buf, prt, buflen) (vio)->peer_addr(vio, buf, prt, buflen) #define vio_io_wait(vio, event, timeout) (vio)->io_wait(vio, event, timeout) -#define vio_timeout(vio, which, seconds) (vio)->timeout(vio, which, seconds) #define vio_is_connected(vio) (vio)->is_connected(vio) #endif /* !defined(DONT_MAP_VIO) */ @@ -260,7 +257,6 @@ struct st_vio void (*in_addr)(Vio*, struct sockaddr_storage*); my_bool (*should_retry)(Vio*); my_bool (*was_timeout)(Vio*); - my_bool (*was_interrupted)(Vio*); int (*vioclose)(Vio*); my_bool (*is_connected)(Vio*); int (*shutdown)(Vio *, int); |