File timidity-int_ptr_casts.patch of Package timidity

Overview Repositories Revisions Requests Users Attributes Meta

File timidity-int_ptr_casts.patch of Package timidity (Revision 6eaa799b712a1486032c70daab9dc5fe)

Currently displaying revision 6eaa799b712a1486032c70daab9dc5fe , Show latest

Index: interface/gtk_i.c
===================================================================
--- interface/gtk_i.c.orig	2004-09-09 07:23:17.000000000 +0200
+++ interface/gtk_i.c	2011-01-18 19:30:21.162694930 +0100
@@ -107,8 +107,8 @@ static GtkTextMark *mark;
 static void
 generic_cb(GtkWidget *widget, gpointer data)
 {
-    gtk_pipe_int_write((int)data);
-    if((int)data == GTK_PAUSE) {
+    gtk_pipe_int_write((int)(long)data);
+    if((int)(long)data == GTK_PAUSE) {
 	gtk_label_set(GTK_LABEL(cnt_lbl), "Pause");
     }
 }
@@ -167,7 +167,7 @@ filer_cb(GtkWidget *widget, gpointer dat
 #endif
     glob_t pglob;
 
-    if((int)data == 1) {
+    if((int)(long)data == 1) {
 	patt = gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel));
 	if(glob(patt, GLOB_BRACE|GLOB_NOMAGIC|GLOB_TILDE, NULL, &pglob))
 	    return;
@@ -195,11 +195,11 @@ generic_scale_cb(GtkAdjustment *adj, gpo
     if(local_adjust)
 	return;
 
-    gtk_pipe_int_write((int)data);
+    gtk_pipe_int_write((int)(long)data);
 
     /* This is a bit of a hack as the volume scale (a GtkVScale) seems
        to have it's minimum at the top which is counter-intuitive. */
-    if((int)data == GTK_CHANGE_VOLUME) {
+    if((int)(long)data == GTK_CHANGE_VOLUME) {
 	gtk_pipe_int_write(MAX_AMPLIFICATION - adj->value);
     }
     else {
@@ -259,7 +259,7 @@ playlist_cb(GtkWidget *widget, guint dat
     gtk_window_set_title(GTK_WINDOW(plfilesel), ((char)data == 'l')?
 			 "Load Playlist":
 			 "Save Playlist");
-    gtk_object_set_user_data(GTK_OBJECT(plfilesel), (gpointer)data);
+    gtk_object_set_user_data(GTK_OBJECT(plfilesel), GUINT_TO_POINTER(data));
     gtk_file_selection_complete(GTK_FILE_SELECTION(plfilesel), "*.tpl");
 
     gtk_widget_show(plfilesel);
@@ -277,7 +277,7 @@ playlist_op(GtkWidget *widget, guint dat
     if(!data)
 	return;
 
-    action = (gchar)(int)gtk_object_get_user_data(GTK_OBJECT(plfilesel));
+    action = (gchar)(long)gtk_object_get_user_data(GTK_OBJECT(plfilesel));
     filename[0] = gtk_file_selection_get_filename(GTK_FILE_SELECTION(plfilesel));
 
     if(action == 'l') {
Index: interface/motif_i.c
===================================================================
--- interface/motif_i.c.orig	2002-01-15 11:53:20.000000000 +0100
+++ interface/motif_i.c	2011-01-18 19:30:21.195695880 +0100
@@ -727,7 +727,7 @@ static Widget make_menu_toggle(char *ite
     item=XmCreateToggleButton(menu,item_name,al,ac);
     XtManageChild(item);
     XtAddCallback(item, XmNvalueChangedCallback,
-		  (XtCallbackProc) menuCB,(XtPointer) client_data);
+		  (XtCallbackProc) menuCB,(XtPointer)(long) client_data);
     XtSetSensitive(item, True);
     return(item);
 }
Index: interface/xaw_i.c
===================================================================
--- interface/xaw_i.c.orig	2011-01-18 19:30:21.076692459 +0100
+++ interface/xaw_i.c	2011-01-18 19:30:21.196695908 +0100
@@ -944,7 +944,7 @@ static void randomCB(Widget w,XtPointer
 
 static void menuCB(Widget w,XtPointer data,XtPointer dummy) {
   onPlayOffPause();
-  sprintf(local_buf,"L %d",((int)data)+1);
+  sprintf(local_buf,"L %d",((int)(long)data)+1);
   a_pipe_write(local_buf);
 }
 
@@ -981,7 +981,7 @@ static void volsetCB(Widget w,XtPointer
 }
 
 static void volupdownCB(Widget w,XtPointer data,XtPointer diff) {
-  int i = ((int)diff > 0)? (-10):10;
+  int i = ((int)(long)diff > 0)? (-10):10;
 
   i += amplitude;
   setVolbar(i);
@@ -1034,7 +1034,7 @@ static void tunesetAction(Widget w,XEven
 static void tuneslideCB(Widget w,XtPointer data,XtPointer diff) {
   char s[16];
 
-  sprintf(s, "T %d\n", curr_time+ (int)diff);
+  sprintf(s, "T %d\n", curr_time+ (int)(long)diff);
   a_pipe_write(s);
 }
 
@@ -2401,7 +2401,7 @@ static void a_readconfig (Config *Cfg) {
           if (c == LF || c == EOF || i > SSIZE) break;
           *p++ = c;
         }
-        *p = (char)NULL;
+        *p = (char)'\0';
         if (0 != strncasecmp(s, "set ", 4)) continue;
         switch (configcmp(s+4, &k)) {
         case S_RepeatPlay:
@@ -2564,7 +2564,7 @@ static void checkRightAndPopupSubmenu(Wi
 
 /*ARGSUSED*/
 static void popdownSubmenuCB(Widget w,XtPointer data,XtPointer dummy) {
-  int i = (int)data;
+  int i = (int)(long)data;
 
   if (i < 0) i = submenu_n -1;
   while(i >= 0) XtPopdown(psmenu[i--]);
@@ -2628,7 +2628,7 @@ static void addOneFile(int max_files,int
   if(menu_height + tmpi*2 > root_height) {
     if(!maxentry_on_a_menu) {
       maxentry_on_a_menu = j = curr_num;
-      XtAddCallback(title_sm,XtNpopdownCallback,popdownSubmenuCB,(XtPointer)(submenu_n -1));
+      XtAddCallback(title_sm,XtNpopdownCallback,popdownSubmenuCB,(XtPointer)(long)(submenu_n -1));
     }
     if(j >= maxentry_on_a_menu) {
       if (psmenu == NULL)
@@ -2660,7 +2660,7 @@ static void addOneFile(int max_files,int
   }
   if(maxentry_on_a_menu) j++;
   bsb=XtVaCreateManagedWidget(fname,smeBSBObjectClass,tmpw,NULL);
-  XtAddCallback(bsb,XtNcallback,menuCB,(XtPointer)curr_num);
+  XtAddCallback(bsb,XtNcallback,menuCB,(XtPointer)(long)curr_num);
   XtVaGetValues(bsb, XtNheight, &tmpi, NULL);
   if(!maxentry_on_a_menu)
     menu_height += tmpi;
Index: timidity/recache.c
===================================================================
--- timidity/recache.c.orig	2004-03-02 14:16:04.000000000 +0100
+++ timidity/recache.c	2011-01-18 19:44:26.713999207 +0100
@@ -56,7 +56,7 @@
 #define MAX_EXPANDLEN (1024 * 32)
 #define CACHE_DATA_LEN (allocate_cache_size / sizeof(sample_t))
 
-#define sp_hash(sp, note) ((unsigned int) (sp) + (unsigned int) (note))
+#define sp_hash(sp, note) ((unsigned long) (sp) + (unsigned long) (note))
 #define CACHE_RESAMPLING_OK 0
 #define CACHE_RESAMPLING_NOTOK 1
 #define SORT_THRESHOLD 20

Places

File timidity-int_ptr_casts.patch of Package timidity (Revision 6eaa799b712a1486032c70daab9dc5fe)

Places