File timidity-gcc4-fix.diff of Package timidity

Overview Repositories Revisions Requests Users Attributes Meta

File timidity-gcc4-fix.diff of Package timidity (Revision a099691d40dc2b62649cfe3b86e5ff7a)

Currently displaying revision a099691d40dc2b62649cfe3b86e5ff7a , Show latest

--- interface/xaw_i.c-dist	2005-04-08 13:00:57.644901404 +0200
+++ interface/xaw_i.c	2005-04-08 13:03:10.047087597 +0200
@@ -261,7 +261,7 @@ int amplitude = DEFAULT_AMPLIFICATION;
 String bitmapdir = XAW_BITMAP_DIR;
 Boolean arrangetitle,savelist;
 static char **current_flist = NULL;
-static int voices = 0, last_voice = 0, voices_num_width;
+static int xaw_voices = 0, xaw_last_voice = 0, xaw_voices_num_width;
 static int maxentry_on_a_menu = 0,submenu_n = 0;
 #define OPTIONS_WINDOW 1
 #define FLIST_WINDOW 2
@@ -1329,9 +1329,9 @@ static void handle_input(XtPointer data,
     c= *(local_buf+1);
     n= atoi(local_buf+2);
     if(c == 'L')
-      voices = n;
+      xaw_voices = n;
     else
-      last_voice = n;
+      xaw_last_voice = n;
     if(IsTracePlaying()) drawVoices();
     break;
   case 'g':
@@ -2067,11 +2067,11 @@ static void drawBank(int ch,int val) {
 #define VOICENUM_WIDTH 56
 static void drawVoices(void) {
   XSetForeground(disp, gct, tracecolor);
-  XFillRectangle(disp,XtWindow(trace),gct,voices_num_width +4,
+  XFillRectangle(disp,XtWindow(trace),gct,xaw_voices_num_width +4,
                  MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+1,VOICENUM_WIDTH,TRACE_FOOT);  
-  sprintf(local_buf, "%3d/%d", last_voice, voices);
+  sprintf(local_buf, "%3d/%d", xaw_last_voice, xaw_voices);
   XSetForeground(disp, gct, capcolor);  
-  XDrawString(disp, XtWindow(trace),gct,voices_num_width+6,
+  XDrawString(disp, XtWindow(trace),gct,xaw_voices_num_width+6,
               MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+16,local_buf,strlen(local_buf));
 }
 
@@ -2244,7 +2244,7 @@ static void initStatus(void) {
     Panel->is_drum[i] = 0;
     *inst_name[i] = '\0';
   }
-  last_voice = 0;
+  xaw_last_voice = 0;
 }
 
 /*ARGSUSED*/
@@ -3651,7 +3651,7 @@ void a_start_interface(int pipe_in) {
     }
     initStatus();
     XFreeGC(disp,gc);
-    voices_num_width = XTextWidth(tracefont,"Voices",6) +VOICES_NUM_OFS;
+    xaw_voices_num_width = XTextWidth(tracefont,"Voices",6) +VOICES_NUM_OFS;
   }
   while (1) {
     a_pipe_read(local_buf,sizeof(local_buf));
--- interface/xaw_i.c.xx	2005-05-10 10:28:55.825834145 +0200
+++ interface/xaw_i.c	2005-05-10 10:34:17.859136285 +0200
@@ -900,8 +900,12 @@
   if (sizeof(thumb) > sizeof(XtArgVal)) {
     XtVaSetValues(vol_bar, XtNtopOfThumb, &thumb, NULL);
   } else {
-    XtArgVal *l_thumb = (XtArgVal *) &thumb;
-    XtVaSetValues(vol_bar, XtNtopOfThumb,*l_thumb, NULL);
+    union {
+	float t;
+	XtArgVal xav;
+    } u;
+    u.t = thumbj;
+    XtVaSetValues(vol_bar, XtNtopOfThumb,u.xav, NULL);
   }
 }
 
@@ -1270,8 +1274,12 @@
       if (sizeof(thumbj) > sizeof(XtArgVal)) {
         XtVaSetValues(tune_bar,XtNtopOfThumb,&thumbj,NULL);
       } else {
-        XtArgVal *l_thumbj = (XtArgVal *) &thumbj;
-        XtVaSetValues(tune_bar,XtNtopOfThumb,*l_thumbj,NULL);
+        union {
+	  float t;
+	  XtArgVal xav;
+        } u;
+        u.t = thumbj;
+        XtVaSetValues(tune_bar,XtNtopOfThumb,u.xav,NULL);
       }
     }
     break;
@@ -1321,8 +1329,12 @@
     if (sizeof(thumb) > sizeof(XtArgVal)) {
       XtVaSetValues(vol_bar, XtNtopOfThumb, &thumb, NULL);
     } else {
-      XtArgVal *l_thumb = (XtArgVal *) &thumb;
-      XtVaSetValues(vol_bar, XtNtopOfThumb,*l_thumb, NULL);
+      union {
+	float t;
+	XtArgVal xav;
+      } u;
+      u.t = thumb;
+      XtVaSetValues(vol_bar, XtNtopOfThumb,u.xav,NULL);
     }
     break;
   case 'v':
@@ -3432,8 +3444,12 @@
   if (sizeof(thumb) > sizeof(XtArgVal)) {
     XtVaSetValues(vol_bar,XtNtopOfThumb,&thumb,NULL);
   } else {
-    XtArgVal * l_thumb = (XtArgVal *) &thumb;
-    XtVaSetValues(vol_bar,XtNtopOfThumb,*l_thumb,NULL);
+    union {
+       float t;
+       XtArgVal xav;
+    } u;
+    u.t = thumb;
+    XtVaSetValues(vol_bar,XtNtopOfThumb,u.xav,NULL);
   }
   play_b=XtVaCreateManagedWidget("play_button",toggleWidgetClass,b_box,
             XtNbitmap,bm_Pixmap[BM_PLAY],
--- timidity/common.h.xx	2005-05-10 10:34:54.534919351 +0200
+++ timidity/common.h	2005-05-10 10:35:04.274310434 +0200
@@ -91,7 +91,7 @@
 extern void code_convert(char *in, char *out, int outsiz,
 			 char *in_code, char *out_code);
 
-extern void safe_exit(int status);
+extern void safe_exit(int status) __attribute__((__noreturn__));
 
 extern char *timidity_version;
 extern MBlockList tmpbuffer;

Places

File timidity-gcc4-fix.diff of Package timidity (Revision a099691d40dc2b62649cfe3b86e5ff7a)

Places