Merge branch 'maint' into next

[simgear.git] / simgear / math / vector.hxx

diff --git a/simgear/math/vector.hxx b/simgear/math/vector.hxx
index 75893c18c2585227a5afadb6f3a801c6133a4f47..cec24236dc8fc0b472b85a1ceef64c1dbe6907f7 100644 (file)
--- a/simgear/math/vector.hxx
+++ b/simgear/math/vector.hxx
@@ -5,7 +5,7 @@
 
 // Written by Curtis Olson, started December 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -17,10 +17,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -29,12 +28,8 @@
 #define _VECTOR_HXX
 
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif                                   
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
 #endif
 
 #include <simgear/compiler.h>