diff options
| -rw-r--r-- | dbug/dbug.c | 2 | ||||
| -rw-r--r-- | include/heap.h | 4 | ||||
| -rw-r--r-- | strings/conf_to_src.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index 1fb8755d605..cfe4ca161c6 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -1365,7 +1365,7 @@ uint _line_) #ifdef THREAD (void) fprintf (_db_fp_, "%-7s: ", my_thread_name()); #else - (void) fprintf (_db_fp_, "%5d: ", getpid ()); + (void) fprintf (_db_fp_, "%5d: ", (int) getpid ()); #endif } if (stack -> flags & NUMBER_ON) { diff --git a/include/heap.h b/include/heap.h index 8cbb500fa86..14698810297 100644 --- a/include/heap.h +++ b/include/heap.h @@ -112,13 +112,13 @@ typedef struct st_heap_share LIST open_list; } HP_SHARE; -struct st_hash_info; +struct st_hp_hash_info; typedef struct st_heap_info { HP_SHARE *s; byte *current_ptr; - struct st_hash_info *current_hash_ptr; + struct st_hp_hash_info *current_hash_ptr; ulong current_record,next_block; int lastinx,errkey; int mode; /* Mode of file (READONLY..) */ diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c index 76316638153..89415d31820 100644 --- a/strings/conf_to_src.c +++ b/strings/conf_to_src.c @@ -80,7 +80,7 @@ print_array(FILE *f, const char *set, const char *name, int n) endptr = p; for (;;) { - while (isspace(*endptr)) + while (isspace((* (unsigned char*) endptr))) ++endptr; if (*endptr && *endptr != '#') /* not comment */ break; @@ -90,7 +90,7 @@ print_array(FILE *f, const char *set, const char *name, int n) } p = val; - while (!isspace(*endptr)) + while (!isspace((* (unsigned char*) endptr))) *p++ = *endptr++; *p = '\0'; p = endptr; |