#! /bin/sh /usr/share/dpatch/dpatch-run
## 02-gcc4.dpatch by  Stephan Hermann <sh@sourcecode.de>
## Original Patch for 1.0.19-1 by Andreas Jochens <aj@andaco.de>
## (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=301844)
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad mysql-admin-1.0.20/mysql-administrator/library/source/myx_user_management.c /tmp/dpep.OKBov4/mysql-admin-1.0.20/mysql-administrator/library/source/myx_user_management.c
--- mysql-admin-1.0.20/mysql-administrator/library/source/myx_user_management.c	2005-04-11 20:04:58.000000000 +0000
+++ /tmp/dpep.OKBov4/mysql-admin-1.0.20/mysql-administrator/library/source/myx_user_management.c	2005-04-19 18:25:51.302154568 +0000
@@ -572,13 +572,13 @@
 }
 
 #define MYX_VECTOR_RESERVE(ptr,size)\
-  (((char*)(ptr))= myx_resize_vector_block((char*)(ptr),sizeof(*(ptr)),\
+  (ptr= myx_resize_vector_block((char*)(ptr),sizeof(*(ptr)),\
                                            (size_t)(size)))
 
 #define MYX_VECTOR_PUSH_BACK(ptr,num,ptr_to_top)\
 {\
   (num)++;\
-  ((char*)(ptr))= myx_resize_vector_block((char*)(ptr),sizeof(*(ptr)),(num));\
+  ptr= myx_resize_vector_block((char*)(ptr),sizeof(*(ptr)),(num));\
   (ptr_to_top)= (ptr) + (num) - 1;\
 }
 
diff -urNad mysql-admin-1.0.20/mysql-administrator/source/linux/MABackupPanel.cc /tmp/dpep.OKBov4/mysql-admin-1.0.20/mysql-administrator/source/linux/MABackupPanel.cc
--- mysql-admin-1.0.20/mysql-administrator/source/linux/MABackupPanel.cc	2005-04-12 03:13:21.000000000 +0000
+++ /tmp/dpep.OKBov4/mysql-admin-1.0.20/mysql-administrator/source/linux/MABackupPanel.cc	2005-04-19 18:27:49.937119312 +0000
@@ -1119,7 +1119,7 @@
                                                          50);
     dlg->show();
 
-    err= (MYX_BACKUP_ERROR)(int)disp.dispatch(backup_thread, &arg);
+    err= (MYX_BACKUP_ERROR)(long)disp.dispatch(backup_thread, &arg);
 
     dlg->hide();
 
diff -urNad mysql-admin-1.0.20/mysql-administrator/source/linux/MAHealthPanel.cc /tmp/dpep.OKBov4/mysql-admin-1.0.20/mysql-administrator/source/linux/MAHealthPanel.cc
--- mysql-admin-1.0.20/mysql-administrator/source/linux/MAHealthPanel.cc	2005-03-13 11:10:03.000000000 +0000
+++ /tmp/dpep.OKBov4/mysql-admin-1.0.20/mysql-administrator/source/linux/MAHealthPanel.cc	2005-04-19 18:28:21.255358216 +0000
@@ -1607,7 +1607,7 @@
 
   variable= row[_value_columns._name];
   
-  if ((int)_instance->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_set_variable,
+  if ((long)_instance->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_set_variable,
                                           (void*)variable.c_str(), 
                                           (void*)new_text.c_str())!=0)
   {
diff -urNad mysql-admin-1.0.20/mysql-administrator/source/linux/MARestorePanel.cc /tmp/dpep.OKBov4/mysql-admin-1.0.20/mysql-administrator/source/linux/MARestorePanel.cc
--- mysql-admin-1.0.20/mysql-administrator/source/linux/MARestorePanel.cc	2005-04-11 20:06:49.000000000 +0000
+++ /tmp/dpep.OKBov4/mysql-admin-1.0.20/mysql-administrator/source/linux/MARestorePanel.cc	2005-04-19 18:28:45.741635736 +0000
@@ -684,7 +684,7 @@
 
     dlg->show();
 
-    err= (MYX_BACKUP_ERROR)(int)disp.dispatch(restore_thread, &arg);
+    err= (MYX_BACKUP_ERROR)(long)disp.dispatch(restore_thread, &arg);
 
     con.disconnect();
   }
diff -urNad mysql-admin-1.0.20/mysql-administrator/source/linux/MInstanceInfo.cc /tmp/dpep.OKBov4/mysql-admin-1.0.20/mysql-administrator/source/linux/MInstanceInfo.cc
--- mysql-admin-1.0.20/mysql-administrator/source/linux/MInstanceInfo.cc	2005-03-13 11:10:03.000000000 +0000
+++ /tmp/dpep.OKBov4/mysql-admin-1.0.20/mysql-administrator/source/linux/MInstanceInfo.cc	2005-04-19 18:29:27.108347040 +0000
@@ -242,7 +242,7 @@
         dlg.run();
       }
       
-      _mysql_tid= (int)perform_data_fetch((DataFetcher)myx_get_thread_id);
+      _mysql_tid= (long)perform_data_fetch((DataFetcher)myx_get_thread_id);
     }
     myx_free_pc_info(server);
 
diff -urNad mysql-admin-1.0.20/mysql-gui-common/source/linux/MGBlobEditor.cc /tmp/dpep.OKBov4/mysql-admin-1.0.20/mysql-gui-common/source/linux/MGBlobEditor.cc
--- mysql-admin-1.0.20/mysql-gui-common/source/linux/MGBlobEditor.cc	2005-03-13 13:16:59.000000000 +0000
+++ /tmp/dpep.OKBov4/mysql-admin-1.0.20/mysql-gui-common/source/linux/MGBlobEditor.cc	2005-04-19 18:31:18.096474280 +0000
@@ -76,7 +76,7 @@
 {
   Path path;
 
-  path.push_back((int)iter.gobj()->user_data);
+  path.push_back((long)iter.gobj()->user_data);
     
   return path;
 }
@@ -86,9 +86,9 @@
 {
   iter->stamp= 1234;
   
-  iter->user_data= (gpointer)((int)iter->user_data+1);
+  iter->user_data= (gpointer)((long)iter->user_data+1);
 
-  return (int)iter->user_data < iter_n_children_vfunc(iter);
+  return (long)iter->user_data < iter_n_children_vfunc(iter);
 }
 
 
@@ -118,7 +118,7 @@
 void MGBlobListStore::get_value_vfunc(const Gtk::TreeModel::iterator& iter, int column, GValue* value)
 {
   char buffer[_bytes_per_row * 4];
-  unsigned int line_num= (unsigned int)iter.gobj()->user_data;
+  unsigned int line_num= (unsigned long)iter.gobj()->user_data;
 
   g_value_init(value, G_TYPE_STRING);