#ifdef HAVE_FLOCKFILE, not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali

Sat Feb 28 14:48:35 2004  Owen Taylor  <otaylor@redhat.com>

        * demos/gtk-demo/main.c (read_line): #ifdef HAVE_FLOCKFILE,
        not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali Harlow)

diff --git a/ChangeLog b/ChangeLog
index d46fece1a378c2c6dbb22b6231b0234d80e781f6..e2606188bb5248ef016e5aa9df19d958f8d932d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 28 14:48:35 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * demos/gtk-demo/main.c (read_line): #ifdef HAVE_FLOCKFILE, 
+       not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali Harlow)
+
 2004-02-28  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkfilesystemwin32.c : adapt to add -> insert_bookmark
@@ -7982,7 +7987,7 @@ Fri Jun  6 11:05:45 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
 Thu Jun  5 20:35:40 2003  Owen Taylor  <otaylor@redhat.com>
 
        * 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 d46fece1a378c2c6dbb22b6231b0234d80e781f6..e2606188bb5248ef016e5aa9df19d958f8d932d4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Feb 28 14:48:35 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * demos/gtk-demo/main.c (read_line): #ifdef HAVE_FLOCKFILE, 
+       not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali Harlow)
+
 2004-02-28  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkfilesystemwin32.c : adapt to add -> insert_bookmark
@@ -7982,7 +7987,7 @@ Fri Jun  6 11:05:45 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
 Thu Jun  5 20:35:40 2003  Owen Taylor  <otaylor@redhat.com>
 
        * 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 d46fece1a378c2c6dbb22b6231b0234d80e781f6..e2606188bb5248ef016e5aa9df19d958f8d932d4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Feb 28 14:48:35 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * demos/gtk-demo/main.c (read_line): #ifdef HAVE_FLOCKFILE, 
+       not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali Harlow)
+
 2004-02-28  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkfilesystemwin32.c : adapt to add -> insert_bookmark
@@ -7982,7 +7987,7 @@ Fri Jun  6 11:05:45 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
 Thu Jun  5 20:35:40 2003  Owen Taylor  <otaylor@redhat.com>
 
        * 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 d46fece1a378c2c6dbb22b6231b0234d80e781f6..e2606188bb5248ef016e5aa9df19d958f8d932d4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Feb 28 14:48:35 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * demos/gtk-demo/main.c (read_line): #ifdef HAVE_FLOCKFILE, 
+       not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali Harlow)
+
 2004-02-28  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkfilesystemwin32.c : adapt to add -> insert_bookmark
@@ -7982,7 +7987,7 @@ Fri Jun  6 11:05:45 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
 Thu Jun  5 20:35:40 2003  Owen Taylor  <otaylor@redhat.com>
 
        * 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 d46fece1a378c2c6dbb22b6231b0234d80e781f6..e2606188bb5248ef016e5aa9df19d958f8d932d4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Feb 28 14:48:35 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * demos/gtk-demo/main.c (read_line): #ifdef HAVE_FLOCKFILE, 
+       not #ifndef HAVE_FLOCKFILE. (#135642, J. Ali Harlow)
+
 2004-02-28  Hans Breuer  <hans@breuer.org>
 
        * gtk/gtkfilesystemwin32.c : adapt to add -> insert_bookmark
@@ -7982,7 +7987,7 @@ Fri Jun  6 11:05:45 2003  Hidetoshi Tajima  <hidetoshi.tajima@sun.com>
 Thu Jun  5 20:35:40 2003  Owen Taylor  <otaylor@redhat.com>
 
        * 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 fb2e7a5b22b0e35e6b887ba15410bf1d6df9a138..f4a893f2a72e96fb888bd772c963059922d4b001 100644 (file)
--- 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);