From 848e79eec8026ed0836f64faad2148836be27836 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 11 May 2003 14:42:36 +0200 Subject: [PATCH] Changed C++ style comments in libdtv into C style to avoid warnings in gcc 3.x --- CONTRIBUTORS | 1 + HISTORY | 2 ++ libdtv/liblx/liblx.h | 53 ++++++++++++++++++++------------------- libdtv/liblx/xListFuncs.c | 53 ++++++++++++++++++++------------------- libdtv/liblx/xMemMgt.c | 53 ++++++++++++++++++++------------------- 5 files changed, 84 insertions(+), 78 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index f9592900..052438cc 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -202,6 +202,7 @@ Andreas Schultz for making EIT filtering use masks to reduce the number of filters for suggesting to remove the Mute() call from cDvbDevice::StillPicture() for suggesting to separate the startup of a plugin into an "early" and a "late" phase + for changing C++ style comments in libdtv into C style to avoid warnings in gcc 3.x Aaron Holtzman for writing 'ac3dec' diff --git a/HISTORY b/HISTORY index 32de2b63..96f99811 100644 --- a/HISTORY +++ b/HISTORY @@ -2139,3 +2139,5 @@ Video Disk Recorder Revision History written. - Implemented separate PausePriority and PauseLifetime parameters for the recordings created when pausing live video (suggested by Alfred Zastrow). +- Changed C++ style comments in libdtv into C style to avoid warnings in gcc 3.x + (thanks to Andreas Schultz). diff --git a/libdtv/liblx/liblx.h b/libdtv/liblx/liblx.h index 26ea664a..2e122956 100644 --- a/libdtv/liblx/liblx.h +++ b/libdtv/liblx/liblx.h @@ -1,29 +1,30 @@ -////////////////////////////////////////////////////////////// -/// /// -/// liblx.h: definitions necessary for the liblx package /// -/// /// -////////////////////////////////////////////////////////////// - -// $Revision: 1.2 $ -// $Date: 2001/06/25 19:39:00 $ -// $Author: hakenes $ -// -// (C) 1992-2001 Rolf Hakenes , under the GNU GPL. -// -// liblx is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2, or (at your option) -// any later version. -// -// liblx is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You may have received a copy of the GNU General Public License -// along with liblx; see the file COPYING. If not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. +/* + * + * liblx.h: definitions necessary for the liblx package + * + * + * $Revision: 1.2 $ + * $Date: 2001/06/25 19:39:00 $ + * $Author: hakenes $ + * + * (C) 1992-2001 Rolf Hakenes , under the GNU GPL. + * + * liblx is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * liblx is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You may have received a copy of the GNU General Public License + * along with liblx; see the file COPYING. If not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + */ #ifndef LIBLX_H #define LIBLX_H diff --git a/libdtv/liblx/xListFuncs.c b/libdtv/liblx/xListFuncs.c index 01b85b85..348c7800 100644 --- a/libdtv/liblx/xListFuncs.c +++ b/libdtv/liblx/xListFuncs.c @@ -1,29 +1,30 @@ -////////////////////////////////////////////////////////////// -/// /// -/// xListFuncs.c: list handling functions of liblx /// -/// /// -////////////////////////////////////////////////////////////// - -// $Revision: 1.1 $ -// $Date: 2001/06/25 12:29:47 $ -// $Author: hakenes $ -// -// (C) 1992-2001 Rolf Hakenes , under the GNU GPL. -// -// liblx is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2, or (at your option) -// any later version. -// -// liblx is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You may have received a copy of the GNU General Public License -// along with liblx; see the file COPYING. If not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. +/* + * + * xListFuncs.c: list handling functions of liblx + * + * + * $Revision: 1.1 $ + * $Date: 2001/08/15 10:00:00 $ + * $Author: hakenes $ + * + * (C) 1992-2001 Rolf Hakenes , under the GNU GPL. + * + * liblx is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * liblx is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You may have received a copy of the GNU General Public License + * along with liblx; see the file COPYING. If not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + */ #include #include "liblx.h" diff --git a/libdtv/liblx/xMemMgt.c b/libdtv/liblx/xMemMgt.c index c93713b0..5f32ce2c 100644 --- a/libdtv/liblx/xMemMgt.c +++ b/libdtv/liblx/xMemMgt.c @@ -1,29 +1,30 @@ -////////////////////////////////////////////////////////////// -/// /// -/// xMemMgt.c: memory management functions of liblx /// -/// /// -////////////////////////////////////////////////////////////// - -// $Revision: 1.1 $ -// $Date: 2001/06/25 12:29:47 $ -// $Author: hakenes $ -// -// (C) 1992-2001 Rolf Hakenes , under the GNU GPL. -// -// liblx is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2, or (at your option) -// any later version. -// -// liblx is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You may have received a copy of the GNU General Public License -// along with liblx; see the file COPYING. If not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. +/* + * + * xMemMgt.c: memory management functions of liblx + * + * + * $Revision: 1.1 $ + * $Date: 2001/08/15 10:00:00 $ + * $Author: hakenes $ + * + * (C) 1992-2001 Rolf Hakenes , under the GNU GPL. + * + * liblx is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * liblx is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You may have received a copy of the GNU General Public License + * along with liblx; see the file COPYING. If not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + */ #include #include