From 6fed66fc9b1a08b02427415d73aaa3b1c54860bf Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 13 Feb 2004 00:03:35 +0000 Subject: [PATCH] Protect getc_unlocked() by HAVE_FLOCKFILE in all cases. (#134205, Julio M. Fri Feb 13 01:06:08 2004 Matthias Clasen * demos/gtk-demo/main.c (read_line): Protect getc_unlocked() by HAVE_FLOCKFILE in all cases. (#134205, Julio M. Merino Vidal) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ demos/gtk-demo/main.c | 2 +- 6 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 257202a37..7636211d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Feb 13 01:06:08 2004 Matthias Clasen + + * demos/gtk-demo/main.c (read_line): Protect getc_unlocked() by + HAVE_FLOCKFILE in all cases. (#134205, Julio M. Merino Vidal) + Fri Feb 13 00:54:59 2004 Matthias Clasen Fix for #104811, Padraig O'Briain: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 257202a37..7636211d6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Feb 13 01:06:08 2004 Matthias Clasen + + * demos/gtk-demo/main.c (read_line): Protect getc_unlocked() by + HAVE_FLOCKFILE in all cases. (#134205, Julio M. Merino Vidal) + Fri Feb 13 00:54:59 2004 Matthias Clasen Fix for #104811, Padraig O'Briain: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 257202a37..7636211d6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Feb 13 01:06:08 2004 Matthias Clasen + + * demos/gtk-demo/main.c (read_line): Protect getc_unlocked() by + HAVE_FLOCKFILE in all cases. (#134205, Julio M. Merino Vidal) + Fri Feb 13 00:54:59 2004 Matthias Clasen Fix for #104811, Padraig O'Briain: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 257202a37..7636211d6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Feb 13 01:06:08 2004 Matthias Clasen + + * demos/gtk-demo/main.c (read_line): Protect getc_unlocked() by + HAVE_FLOCKFILE in all cases. (#134205, Julio M. Merino Vidal) + Fri Feb 13 00:54:59 2004 Matthias Clasen Fix for #104811, Padraig O'Briain: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 257202a37..7636211d6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Feb 13 01:06:08 2004 Matthias Clasen + + * demos/gtk-demo/main.c (read_line): Protect getc_unlocked() by + HAVE_FLOCKFILE in all cases. (#134205, Julio M. Merino Vidal) + Fri Feb 13 00:54:59 2004 Matthias Clasen Fix for #104811, Padraig O'Briain: diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index f6510acdb..fb2e7a5b2 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -122,7 +122,7 @@ read_line (FILE *stream, GString *str) { int c; -#ifndef G_OS_WIN32 +#ifndef HAVE_FLOCKFILE c = getc_unlocked (stream); #else c = getc (stream);