aboutsummaryrefslogtreecommitdiff
path: root/audio/nas/files/patch-clients_audio_audemo_audemo.c
diff options
context:
space:
mode:
Diffstat (limited to 'audio/nas/files/patch-clients_audio_audemo_audemo.c')
-rw-r--r--audio/nas/files/patch-clients_audio_audemo_audemo.c24
1 files changed, 17 insertions, 7 deletions
diff --git a/audio/nas/files/patch-clients_audio_audemo_audemo.c b/audio/nas/files/patch-clients_audio_audemo_audemo.c
index 4620732d03b0..05b0ba8db1b3 100644
--- a/audio/nas/files/patch-clients_audio_audemo_audemo.c
+++ b/audio/nas/files/patch-clients_audio_audemo_audemo.c
@@ -1,36 +1,46 @@
---- clients/audio/audemo/audemo.c Sun Jun 20 15:06:50 2004
-+++ clients/audio/audemo/audemo.c Mon Oct 10 11:12:15 2005
-@@ -29,4 +29,5 @@
+--- clients/audio/audemo/audemo.c.orig 2013-10-07 17:05:48 UTC
++++ clients/audio/audemo/audemo.c
+@@ -28,6 +28,7 @@
+ */
#include "config.h"
+#include <inttypes.h>
#include <stdio.h>
-@@ -973,5 +973,5 @@
+ #if defined(HAVE_STDLIB_H)
+@@ -913,7 +914,7 @@ okAction(Widget w, XEvent *event, String
+ GlobalDataPtr globals;
/* retrieve the address of the globals from the first parameter */
- globals = (GlobalDataPtr) atoi(params[0]);
+ globals = (GlobalDataPtr)(uintptr_t)strtoull(params[0], NULL, 0);
saveOk(w, globals, 0);
}
-@@ -1296,5 +1296,5 @@
+
+@@ -1198,7 +1199,7 @@ static void
+ scrollProcCB(Widget w, XtPointer globalsp, XtPointer positionp)
{
GlobalDataPtr globals = (GlobalDataPtr) globalsp;
- int position = (int) positionp;
+ intptr_t position = (intptr_t) positionp;
int newVolume;
char buf[50];
-@@ -1363,5 +1363,5 @@
+
+@@ -1258,7 +1259,7 @@ static void
+ gainScrollCB(Widget w, XtPointer globalsp, XtPointer positionp)
{
GlobalDataPtr globals = (GlobalDataPtr) globalsp;
- int position = (int) positionp;
+ intptr_t position = (intptr_t) positionp;
int newGain;
char buf[50];
-@@ -1457,5 +1457,5 @@
+
+@@ -1342,7 +1343,7 @@ makeSaveDialog(GlobalDataPtr g)
+ MakeWidget(s->file, s->form, asciiTextWidgetClass, NULL, "filename");
/* pass the address of the globals as an argument to the action */
- sprintf(tmp, "<Key>Return: ok(%u)", (unsigned int) g);
+ sprintf(tmp, "<Key>Return: ok(%p)", g);
XtOverrideTranslations(s->file, XtParseTranslationTable(tmp));
+ /* file format */