summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-10-31 20:28:43 +0200
committermonty@hundin.mysql.fi <>2001-10-31 20:28:43 +0200
commit0716bf4d0ef4ec4dd4eb945c2db54f1e9962f401 (patch)
tree92b080e5371729d9f2b8777445095eb5e0545575 /myisam
parentd89690e606d38e5b0f1d82117cd26a5264325088 (diff)
downloadmariadb-git-0716bf4d0ef4ec4dd4eb945c2db54f1e9962f401.tar.gz
Portability fixes
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_log.c2
-rw-r--r--myisam/myisampack.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/myisam/mi_log.c b/myisam/mi_log.c
index 2d00387a945..5c64c130212 100644
--- a/myisam/mi_log.c
+++ b/myisam/mi_log.c
@@ -33,7 +33,7 @@
#undef GETPID /* For HPUX */
#ifdef THREAD
-#define GETPID() (log_type == 1 ? myisam_pid : (long) my_thread_id());
+#define GETPID() (log_type == 1 ? (long) myisam_pid : (long) my_thread_id());
#else
#define GETPID() myisam_pid
#endif
diff --git a/myisam/myisampack.c b/myisam/myisampack.c
index 1aee5f20fa8..7ee0ff61204 100644
--- a/myisam/myisampack.c
+++ b/myisam/myisampack.c
@@ -893,7 +893,8 @@ static int get_statistic(PACK_MRG_INFO *mrg,HUFF_COUNTS *huff_counts)
DBUG_RETURN(error != HA_ERR_END_OF_FILE);
}
-static int compare_huff_elements(void *not_used, byte *a, byte *b)
+static int compare_huff_elements(void *not_used __attribute__((unused)),
+ byte *a, byte *b)
{
return *((my_off_t*) a) < *((my_off_t*) b) ? -1 :
(*((my_off_t*) a) == *((my_off_t*) b) ? 0 : 1);