From a8bb05787ea1db826c32df658be9ac091ad1cf76 Mon Sep 17 00:00:00 2001
From: borutr <borutr@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sun, 18 Jun 2006 21:08:05 +0000
Subject: [PATCH] * support/regression/tests/structflexarray.c: flexible array
 members   not supported by gcc < 3 * sim/ucsim/configure,
 sim/ucsim/configure.in: do not compile serio   GUI tool by default *
 src/pic/gen.c: don't include [p]strdin.h on solaris * support/Util/pstdint.h:
 addad svn attributes

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4240 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 sim/ucsim/configure                        | 9 +++++----
 sim/ucsim/configure.in                     | 2 +-
 src/pic/gen.c                              | 2 ++
 support/regression/tests/structflexarray.c | 8 ++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/sim/ucsim/configure b/sim/ucsim/configure
index 48b58e58..4ebd0401 100755
--- a/sim/ucsim/configure
+++ b/sim/ucsim/configure
@@ -1649,7 +1649,7 @@ if test "${enable_portmon+set}" = set; then
     enable_serio="yes"
 fi
 else
-  enable_serio="yes"
+  enable_serio="no"
 fi;
 
 
@@ -14241,9 +14241,10 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_i=`echo "$ac_i" |
 	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
diff --git a/sim/ucsim/configure.in b/sim/ucsim/configure.in
index 1faa094b..172a9634 100644
--- a/sim/ucsim/configure.in
+++ b/sim/ucsim/configure.in
@@ -82,7 +82,7 @@ AC_ARG_ENABLE(portmon,
 if test $enable_serio != "no"; then
     enable_serio="yes"
 fi,
-enable_serio="yes")
+enable_serio="no")
 AC_SUBST(enable_ucsim)
 AC_SUBST(enable_dlso)
 AC_SUBST(enable_51)
diff --git a/src/pic/gen.c b/src/pic/gen.c
index 18b3be6f..169fc0f3 100644
--- a/src/pic/gen.c
+++ b/src/pic/gen.c
@@ -34,11 +34,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#ifndef __sun__
 #if defined(_MSC_VER)
 	#include "pstdint.h"
 #else
 	#include <stdint.h>
 #endif
+#endif
 #include "SDCCglobl.h"
 #include "newalloc.h" 
 
diff --git a/support/regression/tests/structflexarray.c b/support/regression/tests/structflexarray.c
index fb991337..2cfdd9d9 100644
--- a/support/regression/tests/structflexarray.c
+++ b/support/regression/tests/structflexarray.c
@@ -2,7 +2,7 @@
  */
 #include <testfwk.h>
 
-#if !defined __GNUC__ || __GNUC__ > 2
+#if !defined __GNUC__ || __GNUC__ >= 3
 /* flexible array members not supported by gcc < 3 */
 struct str1
 {
@@ -17,7 +17,7 @@ struct str1 s12 = { 4, {5, 6, 7} }; /* different size */
 static void
 testFlexibleArray1(void)
 {
-#if !defined __GNUC__ || __GNUC__ > 2
+#if !defined __GNUC__ || __GNUC__ >= 3
   /* flexible array members not supported by gcc < 3 */
   /* test sizeof */
   ASSERT(sizeof(s11) == 1);
@@ -31,7 +31,7 @@ testFlexibleArray1(void)
 
 /* test initialisation with string */
 
-#if !defined __GNUC__ || __GNUC__ > 2
+#if !defined __GNUC__ || __GNUC__ >= 3
 /* flexible array members not supported by gcc < 3 */
 struct str2
 {
@@ -46,7 +46,7 @@ struct str2 s22 = { 2, "sdcc is great" }; /* different size */
 static void
 testFlexibleArray2(void)
 {
-#if !defined __GNUC__ || __GNUC__ > 2
+#if !defined __GNUC__ || __GNUC__ >= 3
   /* flexible array members not supported by gcc < 3 */
   /* test sizeof */
   ASSERT(sizeof(s21) == 2);
-- 
2.30.2