__sparc__ not defined with Forte C

[Gregg Mattinson]

I downloaded wine-20020710 yesterday, and I'm glad to see that most of my 
patches are in it.  There were a few changes that didn't make it in though, so 
I'm re-submitting those patches.

ChangeLog: dlls/ntdll/signal_sparc.c include/basetsd.h
           include/wine/port.h server/context_sparc.c
 - __sparc__ is not defined with Forte C, but __sparc is defined with both Forte 
and GCC.  Same goes for __sun__
 - Forte C doesn't like @function.  Replaced it with 2.
 
Gregg Mattinson
Co-op Developer
Sun Microsystems of Canada

-------------- next part --------------
Index: dlls/ntdll/signal_sparc.c
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/dlls/ntdll/signal_sparc.c,v
retrieving revision 1.2
diff -u -r1.2 signal_sparc.c
--- /tmp/T0LPaiBW	Thu Jul 11 14:23:00 2002
+++ signal_sparc.c	Thu Jul 11 13:41:49 2002
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifdef __sparc__
+#if defined(__sparc__) || defined(__sparc)
 
 #include "config.h"
 
Index: include/basetsd.h
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/include/basetsd.h,v
retrieving revision 1.1
diff -u -r1.1 basetsd.h
--- /tmp/T0V9ayDW	Thu Jul 11 14:23:38 2002
+++ basetsd.h	Tue Jun 25 07:50:43 2002
@@ -158,6 +158,18 @@
 
 /* Architecture dependent settings. */
 /* These are hardcoded to avoid dependencies on config.h in Winelib apps. */
+#ifdef __sparc
+#ifndef __sparc__
+#define __sparc__
+#endif
+#endif
+
+#ifdef __sun
+#ifndef __sun__
+#define __sun__
+#endif
+#endif
+
 #if defined(__i386__)
 # undef  WORDS_BIGENDIAN
 # undef  BITFIELDS_BIGENDIAN
Index: include/wine/port.h
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/include/wine/port.h,v
retrieving revision 1.2
diff -u -r1.2 port.h
--- /tmp/T0tMa4HW	Thu Jul 11 14:23:49 2002
+++ port.h	Tue Jun 25 15:23:14 2002
@@ -141,7 +141,11 @@
 #ifdef NEED_TYPE_IN_DEF
 # define __ASM_FUNC(name) ".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef"
 #else
+#ifndef __SUNPRO_C
 # define __ASM_FUNC(name) ".type " __ASM_NAME(name) ", at function"
+#else
+# define __ASM_FUNC(name) ".type " __ASM_NAME(name) ",2"
+#endif
 #endif
 
 #ifdef __GNUC__
Index: server/context_sparc.c
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/server/context_sparc.c,v
retrieving revision 1.1
diff -u -r1.1 context_sparc.c
--- /tmp/T0Sraa8W       Fri Jul 12 09:47:32 2002
+++ context_sparc.c     Fri Jul 12 09:45:30 2002
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#ifdef __sparc__
+#if defined(__sparc__) || defined(__sparc)
 
 #include <assert.h>
 #include <errno.h>