You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

52 lines
2.0 KiB

# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../xawtv/gcc4.patch
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -Nur xawtv-3.95.orig/common/channel.c xawtv-3.95/common/channel.c
--- xawtv-3.95.orig/common/channel.c 2003-03-28 14:22:06.000000000 +0200
+++ xawtv-3.95/common/channel.c 2005-10-23 17:00:09.000000000 +0300
@@ -167,7 +167,7 @@
/* ----------------------------------------------------------------------- */
-struct STRTAB captab[] = {
+struct STRTAB *captab = {
{ CAPTURE_ON, "on" },
{ CAPTURE_ON, "yes" },
{ CAPTURE_ON, "true" },
@@ -722,7 +722,7 @@
/* ----------------------------------------------------------------------- */
-struct STRTAB booltab[] = {
+struct STRTAB *booltab = {
{ 0, "no" },
{ 0, "false" },
{ 0, "off" },
diff -Nur xawtv-3.95.orig/common/channel.h xawtv-3.95/common/channel.h
--- xawtv-3.95.orig/common/channel.h 2003-02-14 16:14:04.000000000 +0200
+++ xawtv-3.95/common/channel.h 2005-10-23 16:58:58.000000000 +0300
@@ -90,8 +90,8 @@
/* ----------------------------------------------------------------------- */
-extern struct STRTAB booltab[];
-extern struct STRTAB captab[];
+extern struct STRTAB *booltab;
+extern struct STRTAB *captab;
int str_to_int(char *str, struct STRTAB *tab);
const char* int_to_str(int n, struct STRTAB *tab);