From 1001c2d137aa9f3b6f485ba1cafe713034fb1098 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 14 Sep 2008 21:45:04 +0000
Subject: [PATCH] Deal with ELF underscores on Solaris with Sun Studio.

Fixes Bugzilla #595.
---
 src/hermes/HeadMMX.h | 2 +-
 src/hermes/HeadX86.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hermes/HeadMMX.h b/src/hermes/HeadMMX.h
index 11cf6da5b..5d9850cca 100644
--- a/src/hermes/HeadMMX.h
+++ b/src/hermes/HeadMMX.h
@@ -46,7 +46,7 @@ void ConvertMMXp32_16RGB555();
 
 /* Fix the underscore business with ELF compilers */
 
-#if defined(__ELF__) && defined(__GNUC__)
+#if (defined(__ELF__) && defined(__GNUC__)) || defined(__SUNPRO_C)
   #ifdef __cplusplus 
   extern "C" {   
   #endif
diff --git a/src/hermes/HeadX86.h b/src/hermes/HeadX86.h
index 54e0cc9d7..fc6b6dddd 100644
--- a/src/hermes/HeadX86.h
+++ b/src/hermes/HeadX86.h
@@ -74,7 +74,7 @@ extern int ConvertX86p16_32BGRA888_LUT_X86[512];
 
 /* Now fix up the ELF underscore problem */
 
-#if defined(__ELF__) && defined(__GNUC__)
+#if (defined(__ELF__) && defined(__GNUC__)) || defined(__SUNPRO_C)
   #ifdef __cplusplus
   extern "C" {
   #endif