diff options
| author |   Karl Trygve Kalleberg <karltk@gentoo.org> | 2004-03-11 12:13:27 +0000 |
|---|---|---|
| committer | Karl Trygve Kalleberg <karltk@gentoo.org> | 2004-03-11 12:13:27 +0000 |
| commit | 4c28c5edc750c41c10b7d2385801685f7938defb (patch) | |
| tree | 6fd5d7a1be857dba874d3d38d147609a09957ab6 /media-sound/xmp/files | |
| parent | Added to ~ppc (Manifest recommit) (diff) | |
| download | gentoo-2-4c28c5edc750c41c10b7d2385801685f7938defb.tar.gz gentoo-2-4c28c5edc750c41c10b7d2385801685f7938defb.tar.bz2 gentoo-2-4c28c5edc750c41c10b7d2385801685f7938defb.zip | |
Fixes gcc 3.3 compilation errors.
Diffstat (limited to 'media-sound/xmp/files')
| -rw-r--r-- | media-sound/xmp/files/digest-xmp-2.0.5_pre3-r1 | 1 | ||||
| -rw-r--r-- | media-sound/xmp/files/xmp-2.0.5_pre3-gcc3.3.diff | 62 |
2 files changed, 63 insertions, 0 deletions
diff --git a/media-sound/xmp/files/digest-xmp-2.0.5_pre3-r1 b/media-sound/xmp/files/digest-xmp-2.0.5_pre3-r1 new file mode 100644 index 000000000000..3198e4ee7d7a --- /dev/null +++ b/media-sound/xmp/files/digest-xmp-2.0.5_pre3-r1 @@ -0,0 +1 @@ +MD5 749db9c8da956b403a959b4c8b909447 xmp-2.0.5pre3.tar.bz2 318375 diff --git a/media-sound/xmp/files/xmp-2.0.5_pre3-gcc3.3.diff b/media-sound/xmp/files/xmp-2.0.5_pre3-gcc3.3.diff new file mode 100644 index 000000000000..1f8b9c6472e2 --- /dev/null +++ b/media-sound/xmp/files/xmp-2.0.5_pre3-gcc3.3.diff @@ -0,0 +1,62 @@ +diff -x '*.h' -x '*.status' -x '*.log' -x '*.rules' -x '*.cache' -urN xmp-2.0.5-pre3/src/loaders/it_load.c xmp-2.0.5-pre3.fixed/src/loaders/it_load.c +--- xmp-2.0.5-pre3/src/loaders/it_load.c 2000-12-29 19:08:28.000000000 +0100 ++++ xmp-2.0.5-pre3.fixed/src/loaders/it_load.c 2004-03-11 12:38:20.459060960 +0100 +@@ -327,14 +327,14 @@ + + #define BUILD_ENV(X) { \ + fread (&env, 1, sizeof (env), f); \ +- xxih[i].##X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \ +- xxih[i].##X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \ +- xxih[i].##X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \ +- xxih[i].##X##ei.npt = env.num; \ +- xxih[i].##X##ei.sus = env.slb; \ +- xxih[i].##X##ei.sue = env.sle; \ +- xxih[i].##X##ei.lps = env.lpb; \ +- xxih[i].##X##ei.lpe = env.lpe; \ ++ xxih[i].X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \ ++ xxih[i].X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \ ++ xxih[i].X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \ ++ xxih[i].X##ei.npt = env.num; \ ++ xxih[i].X##ei.sus = env.slb; \ ++ xxih[i].X##ei.sue = env.sle; \ ++ xxih[i].X##ei.lps = env.lpb; \ ++ xxih[i].X##ei.lpe = env.lpe; \ + if (env.num) xx##X##e[i] = calloc (4, env.num); \ + for (j = 0; j < env.num; j++) { \ + L_ENDIAN16 (env.node[j].x); \ +diff -x '*.h' -x '*.status' -x '*.log' -x '*.rules' -x '*.cache' -urN xmp-2.0.5-pre3/src/xmms/plugin.c xmp-2.0.5-pre3.fixed/src/xmms/plugin.c +--- xmp-2.0.5-pre3/src/xmms/plugin.c 2001-02-04 01:47:38.000000000 +0100 ++++ xmp-2.0.5-pre3.fixed/src/xmms/plugin.c 2004-03-11 12:48:04.595258760 +0100 +@@ -284,7 +284,7 @@ + xmp_cfg.filter = TRUE; + xmp_cfg.pan_amplitude = 80; + +-#define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg.##x) ++#define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg.x) + + filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL); + if ((cfg = xmms_cfg_open_file(filename))) { +@@ -668,12 +668,12 @@ + + /* Options */ + +-#define OPTCHECK(w,l,o) { \ ++#define OPTCHECK(w,l,ox) { \ + w = gtk_check_button_new_with_label(l); \ + gtk_object_set_data(GTK_OBJECT(xmp_conf_window), #w, w); \ + gtk_widget_show(w); \ + gtk_box_pack_start(GTK_BOX(vbox6), w, TRUE, TRUE, 0); \ +- if (xmp_cfg.##o == 1) \ ++ if (xmp_cfg.ox == 1) \ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE); \ + } + +@@ -773,7 +773,7 @@ + if (!cfg) + cfg = xmms_cfg_new(); + +-#define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg.##x) ++#define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg.x) + + CFGWRITEINT (mixing_freq); + CFGWRITEINT (force8bit); |