[pkgsrc/trunk]: pkgsrc/devel/bmake/files Add QNX support. Don't redefine __BE...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7a967699858a
branches:  trunk
changeset: 533002:7a967699858a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Sep 06 20:25:21 2007 +0000

description:
Add QNX support. Don't redefine __BEGIN_DECLS and __END_DECLS if
system headers provided them. From Sean Boudreau.

diffstat:

 devel/bmake/files/missing/sys/cdefs.h |  18 +++++++++++++-----
 devel/bmake/files/os.sh               |   7 ++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r 688e91318f1d -r 7a967699858a devel/bmake/files/missing/sys/cdefs.h
--- a/devel/bmake/files/missing/sys/cdefs.h     Thu Sep 06 20:13:44 2007 +0000
+++ b/devel/bmake/files/missing/sys/cdefs.h     Thu Sep 06 20:25:21 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cdefs.h,v 1.2 2007/05/07 22:19:32 rillig Exp $ */
+/*     $NetBSD: cdefs.h,v 1.3 2007/09/06 20:25:21 joerg Exp $  */
 
 /*
  * Copyright (c) 1991, 1993
@@ -73,11 +73,19 @@
 #endif
 
 #if defined(__cplusplus)
-#define        __BEGIN_DECLS   extern "C" {
-#define        __END_DECLS     };
+#  ifndef __BEGIN_DECLS
+#  define __BEGIN_DECLS        extern "C" {
+#  endif
+#  ifndef __END_DECLS
+#  define __END_DECLS  };
+#  endif
 #else
-#define        __BEGIN_DECLS
-#define        __END_DECLS
+#  ifndef __BEGIN_DECLS
+#  define __BEGIN_DECLS
+#  endif
+#  ifndef __END_DECLS
+#  define __END_DECLS
+#  endif
 #endif
 
 /*
diff -r 688e91318f1d -r 7a967699858a devel/bmake/files/os.sh
--- a/devel/bmake/files/os.sh   Thu Sep 06 20:13:44 2007 +0000
+++ b/devel/bmake/files/os.sh   Thu Sep 06 20:25:21 2007 +0000
@@ -17,7 +17,7 @@
 #      Simon J. Gerraty <sjg%crufty.net@localhost>
 
 # RCSid:
-#      $Id: os.sh,v 1.1.1.1 2005/12/02 00:02:59 sjg Exp $
+#      $Id: os.sh,v 1.2 2007/09/06 20:25:21 joerg Exp $
 #
 #      @(#) Copyright (c) 1994 Simon J. Gerraty
 #
@@ -172,6 +172,11 @@
        PS_AXC=axc
        [ -x /usr/bin/md5sum ] && { MD5=/usr/bin/md5sum; export MD5; }
        ;;
+QNX)
+       case $MACHINE in
+       x86pc)  MACHINE_ARCH=i386;;
+       esac
+       ;;
 esac
 
 HOSTNAME=${HOSTNAME:-`( hostname ) 2>/dev/null`}