package/multimedia/xawtv/hotfix-gcc4.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../xawtv/gcc4.patch
   5 # Copyright (C) 2004 - 2006 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16 diff -Nur xawtv-3.95.orig/common/channel.c xawtv-3.95/common/channel.c
  17 --- xawtv-3.95.orig/common/channel.c    2003-03-28 14:22:06.000000000 +0200
  18 +++ xawtv-3.95/common/channel.c 2005-10-23 17:00:09.000000000 +0300
  19 @@ -167,7 +167,7 @@
  20
  21  /* ----------------------------------------------------------------------- */
  22
  23 -struct STRTAB captab[] = {
  24 +struct STRTAB *captab = {
  25      {  CAPTURE_ON,          "on"          },
  26      {  CAPTURE_ON,          "yes"         },
  27      {  CAPTURE_ON,          "true"        },
  28 @@ -722,7 +722,7 @@
  29
  30  /* ----------------------------------------------------------------------- */
  31
  32 -struct STRTAB booltab[] = {
  33 +struct STRTAB *booltab = {
  34      {  0, "no" },
  35      {  0, "false" },
  36      {  0, "off" },
  37 diff -Nur xawtv-3.95.orig/common/channel.h xawtv-3.95/common/channel.h
  38 --- xawtv-3.95.orig/common/channel.h    2003-02-14 16:14:04.000000000 +0200
  39 +++ xawtv-3.95/common/channel.h 2005-10-23 16:58:58.000000000 +0300
  40 @@ -90,8 +90,8 @@
  41
  42  /* ----------------------------------------------------------------------- */
  43
  44 -extern struct STRTAB booltab[];
  45 -extern struct STRTAB captab[];
  46 +extern struct STRTAB *booltab;
  47 +extern struct STRTAB *captab;
  48
  49  int str_to_int(char *str, struct STRTAB *tab);
  50  const char* int_to_str(int n, struct STRTAB *tab);