From d66c0987621f14a98c1cd26d025ca1f8b0d1a0b4 Mon Sep 17 00:00:00 2001
From: unknown <monty@hundin.mysql.fi>
Date: Thu, 30 Aug 2001 10:51:36 +0300
Subject: [PATCH] Portability fixes

dbug/dbug.c:
  Portability fix
include/heap.h:
  Portability fix
strings/conf_to_src.c:
  Portability fix
---
 dbug/dbug.c           | 2 +-
 include/heap.h        | 4 ++--
 strings/conf_to_src.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dbug/dbug.c b/dbug/dbug.c
index 1fb8755d60..cfe4ca161c 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 8cbb500fa8..1469881029 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 7631663815..89415d3182 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;
-- 
2.30.9