From 00c66abc0e3bf9b5dbe64b8a05ba19eaea0f8357 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Tue, 20 Feb 2007 18:43:10 +0000
Subject: [PATCH] Update copyright years and use "#ifndef" instead of "#if
 !defined".

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5701 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 fluid/fluid.cxx | 4 ++--
 fluid/undo.cxx  | 4 ++--
 src/flstring.h  | 8 ++++----
 test/demo.cxx   | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index df48ef78d..54465015a 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -3,7 +3,7 @@
 //
 // FLUID main entry for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2005 by Bill Spitzak and others.
+// Copyright 1998-2007 by Bill Spitzak and others.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -59,7 +59,7 @@
 #  include <io.h>
 #  include <commdlg.h>
 #  include <FL/x.H>
-#  if !defined(__WATCOMC__)
+#  ifndef __WATCOMC__
 // Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs
 // on Windows, which is supposed to be POSIX compliant...
 #    define access _access
diff --git a/fluid/undo.cxx b/fluid/undo.cxx
index 54e0bcd6c..1b88eeaf4 100644
--- a/fluid/undo.cxx
+++ b/fluid/undo.cxx
@@ -3,7 +3,7 @@
 //
 // FLUID undo support for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2005 by Bill Spitzak and others.
+// Copyright 1998-2007 by Bill Spitzak and others.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -34,7 +34,7 @@
 #  include <io.h>
 #  include <windows.h>
 #  define getpid (int)GetCurrentProcessId
-#  if !defined(__WATCOMC__)
+#  ifndef __WATCOMC__
 // Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs
 // on Windows, which is supposed to be POSIX compliant...
 #    define unlink _unlink
diff --git a/src/flstring.h b/src/flstring.h
index da114b2c6..58ec66d72 100644
--- a/src/flstring.h
+++ b/src/flstring.h
@@ -3,7 +3,7 @@
  *
  * Common string header file for the Fast Light Tool Kit (FLTK).
  *
- * Copyright 1998-2005 by Bill Spitzak and others.
+ * Copyright 1998-2007 by Bill Spitzak and others.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -52,9 +52,9 @@
 #    define strcasecmp(s,t)	_stricmp((s), (t))
 #    define strncasecmp(s,t,n)	_strnicmp((s), (t), (n))
 // Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs
-// on Windows, which is supposed to be POSIX compliant...  Some of these functions
-// are also defined in ISO C99...
-#    if !defined(__WATCOMC__)
+// on Windows, which is supposed to be POSIX compliant...  Some of these
+// functions are also defined in ISO C99...
+#    ifndef __WATCOMC__
 #      define strdup _strdup
 #      define unlink _unlink
 #    endif // !__WATCOMC__
diff --git a/test/demo.cxx b/test/demo.cxx
index 1e9382235..ee75b2424 100644
--- a/test/demo.cxx
+++ b/test/demo.cxx
@@ -3,7 +3,7 @@
 //
 // Main demo program for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2005 by Bill Spitzak and others.
+// Copyright 1998-2007 by Bill Spitzak and others.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #if defined(WIN32) && !defined(__CYGWIN__)
 #  include <direct.h>
-#  if !defined(__WATCOMC__)
+#  ifndef __WATCOMC__
 // Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs
 // on Windows, which is supposed to be POSIX compliant...
 #    define chdir _chdir