From 9a0fa4a78d54caee6fa61085f21c9899cc0a91fc Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 28 Feb 2004 20:00:24 +0000 Subject: [PATCH] #ifdef HAVE_FLOCKFILE, not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali Sat Feb 28 14:48:35 2004 Owen Taylor * demos/gtk-demo/main.c (read_line): #ifdef HAVE_FLOCKFILE, not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali Harlow) --- ChangeLog | 7 ++++++- ChangeLog.pre-2-10 | 7 ++++++- ChangeLog.pre-2-4 | 7 ++++++- ChangeLog.pre-2-6 | 7 ++++++- ChangeLog.pre-2-8 | 7 ++++++- demos/gtk-demo/main.c | 2 +- 6 files changed, 31 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d46fece1a3..e2606188bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Feb 28 14:48:35 2004 Owen Taylor + + * demos/gtk-demo/main.c (read_line): #ifdef HAVE_FLOCKFILE, + not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali Harlow) + 2004-02-28 Hans Breuer * gtk/gtkfilesystemwin32.c : adapt to add -> insert_bookmark @@ -7982,7 +7987,7 @@ Fri Jun 6 11:05:45 2003 Hidetoshi Tajima Thu Jun 5 20:35:40 2003 Owen Taylor * demos/Makefile.am: Conditionalize dependencies for - gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlowe). + gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlow). Buildtest-inline-pixbufs.h in srcdir. Don't try to build test-inline-pixbufs.h if we don't have libpng. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d46fece1a3..e2606188bb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Feb 28 14:48:35 2004 Owen Taylor + + * demos/gtk-demo/main.c (read_line): #ifdef HAVE_FLOCKFILE, + not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali Harlow) + 2004-02-28 Hans Breuer * gtk/gtkfilesystemwin32.c : adapt to add -> insert_bookmark @@ -7982,7 +7987,7 @@ Fri Jun 6 11:05:45 2003 Hidetoshi Tajima Thu Jun 5 20:35:40 2003 Owen Taylor * demos/Makefile.am: Conditionalize dependencies for - gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlowe). + gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlow). Buildtest-inline-pixbufs.h in srcdir. Don't try to build test-inline-pixbufs.h if we don't have libpng. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d46fece1a3..e2606188bb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Feb 28 14:48:35 2004 Owen Taylor + + * demos/gtk-demo/main.c (read_line): #ifdef HAVE_FLOCKFILE, + not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali Harlow) + 2004-02-28 Hans Breuer * gtk/gtkfilesystemwin32.c : adapt to add -> insert_bookmark @@ -7982,7 +7987,7 @@ Fri Jun 6 11:05:45 2003 Hidetoshi Tajima Thu Jun 5 20:35:40 2003 Owen Taylor * demos/Makefile.am: Conditionalize dependencies for - gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlowe). + gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlow). Buildtest-inline-pixbufs.h in srcdir. Don't try to build test-inline-pixbufs.h if we don't have libpng. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d46fece1a3..e2606188bb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Feb 28 14:48:35 2004 Owen Taylor + + * demos/gtk-demo/main.c (read_line): #ifdef HAVE_FLOCKFILE, + not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali Harlow) + 2004-02-28 Hans Breuer * gtk/gtkfilesystemwin32.c : adapt to add -> insert_bookmark @@ -7982,7 +7987,7 @@ Fri Jun 6 11:05:45 2003 Hidetoshi Tajima Thu Jun 5 20:35:40 2003 Owen Taylor * demos/Makefile.am: Conditionalize dependencies for - gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlowe). + gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlow). Buildtest-inline-pixbufs.h in srcdir. Don't try to build test-inline-pixbufs.h if we don't have libpng. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d46fece1a3..e2606188bb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Feb 28 14:48:35 2004 Owen Taylor + + * demos/gtk-demo/main.c (read_line): #ifdef HAVE_FLOCKFILE, + not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali Harlow) + 2004-02-28 Hans Breuer * gtk/gtkfilesystemwin32.c : adapt to add -> insert_bookmark @@ -7982,7 +7987,7 @@ Fri Jun 6 11:05:45 2003 Hidetoshi Tajima Thu Jun 5 20:35:40 2003 Owen Taylor * demos/Makefile.am: Conditionalize dependencies for - gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlowe). + gdk-pixbuf-csource on cross-compilation (#112391, J. Ali Harlow). Buildtest-inline-pixbufs.h in srcdir. Don't try to build test-inline-pixbufs.h if we don't have libpng. diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index fb2e7a5b22..f4a893f2a7 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 HAVE_FLOCKFILE +#ifdef HAVE_FLOCKFILE c = getc_unlocked (stream); #else c = getc (stream);