mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed a problem with the ERR macro defined by ncurses.h
This commit is contained in:
parent
da56a94dbf
commit
e11c7e4b1c
@ -137,6 +137,7 @@ Matjaz Thaler <matjaz.thaler@guest.arnes.si>
|
|||||||
|
|
||||||
Artur Skawina <skawina@geocities.com>
|
Artur Skawina <skawina@geocities.com>
|
||||||
for improving the font file generation in the Makefile
|
for improving the font file generation in the Makefile
|
||||||
|
for pointing out a problem with the ERR macro defined by ncurses.h
|
||||||
|
|
||||||
Werner Fink <werner@suse.de>
|
Werner Fink <werner@suse.de>
|
||||||
for making I/O more robust by handling EINTR
|
for making I/O more robust by handling EINTR
|
||||||
|
2
HISTORY
2
HISTORY
@ -967,3 +967,5 @@ Video Disk Recorder Revision History
|
|||||||
(driver bug?). Note, though, that since VDR is mainly a *video recorder*, some
|
(driver bug?). Note, though, that since VDR is mainly a *video recorder*, some
|
||||||
features like, e. g., the progress display, may not work as expected with
|
features like, e. g., the progress display, may not work as expected with
|
||||||
radio recordings. Thanks to Michael Paar.
|
radio recordings. Thanks to Michael Paar.
|
||||||
|
- Fixed a problem with the ERR macro defined by ncurses.h (thanks to Artur
|
||||||
|
Skawina).
|
||||||
|
3
dvbapi.h
3
dvbapi.h
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: dvbapi.h 1.60 2002/01/26 13:01:16 kls Exp $
|
* $Id: dvbapi.h 1.61 2002/02/03 16:43:38 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __DVBAPI_H
|
#ifndef __DVBAPI_H
|
||||||
@ -12,6 +12,7 @@
|
|||||||
|
|
||||||
#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
|
#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
|
||||||
#include <ncurses.h>
|
#include <ncurses.h>
|
||||||
|
#undef ERR //XXX ncurses defines this - but this clashes with newer system header files
|
||||||
#endif
|
#endif
|
||||||
#include <stdlib.h> // FIXME: this is apparently necessary for the ost/... header files
|
#include <stdlib.h> // FIXME: this is apparently necessary for the ost/... header files
|
||||||
// FIXME: shouldn't every header file include ALL the other header
|
// FIXME: shouldn't every header file include ALL the other header
|
||||||
|
3
dvbosd.h
3
dvbosd.h
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: dvbosd.h 1.9 2002/01/13 15:48:00 kls Exp $
|
* $Id: dvbosd.h 1.10 2002/02/03 16:43:50 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __DVBOSD_H
|
#ifndef __DVBOSD_H
|
||||||
@ -12,6 +12,7 @@
|
|||||||
|
|
||||||
#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
|
#if defined(DEBUG_OSD) || defined(REMOTE_KBD)
|
||||||
#include <ncurses.h>
|
#include <ncurses.h>
|
||||||
|
#undef ERR //XXX ncurses defines this - but this clashes with newer system header files
|
||||||
#endif
|
#endif
|
||||||
#include <ost/osd.h>
|
#include <ost/osd.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
3
tools.c
3
tools.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: tools.c 1.55 2002/02/03 13:35:38 kls Exp $
|
* $Id: tools.c 1.56 2002/02/03 16:44:08 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "tools.h"
|
#include "tools.h"
|
||||||
@ -13,6 +13,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#if defined(DEBUG_OSD)
|
#if defined(DEBUG_OSD)
|
||||||
#include <ncurses.h>
|
#include <ncurses.h>
|
||||||
|
#undef ERR //XXX ncurses defines this - but this clashes with newer system header files
|
||||||
#endif
|
#endif
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user