Bash-4.3 patch 32

[thirdparty/bash.git] / conftypes.h

diff --git a/conftypes.h b/conftypes.h
index e5e18736f38c23fc2e25c872a7ea17e03c9b1b50..1c8c5480a4ce3aeb7c156df7fcd17aff562eac14 100644 (file)
--- a/conftypes.h
+++ b/conftypes.h
@@ -1,22 +1,22 @@
 /* conftypes.h -- defines for build and host system. */
 
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2005, 2008,2009 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
-   Bash is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   Bash is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   Bash is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-   License for more details.
+   Bash is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with Bash; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   along with Bash.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #if !defined (_CONFTYPES_H_)
 #define _CONFTYPES_H_
@@ -24,7 +24,7 @@
 /* Placeholder for future modifications if cross-compiling or building a
    `fat' binary, e.g. on Apple Rhapsody.  These values are used in multiple
    files, so they appear here. */
-#if !defined (RHAPSODY)
+#if !defined (RHAPSODY) && !defined (MACOSX)
 #  define HOSTTYPE     CONF_HOSTTYPE
 #  define OSTYPE       CONF_OSTYPE
 #  define MACHTYPE     CONF_MACHTYPE