From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 28 Jan 2004 22:01:47 +0000 (+0000)
Subject: tweak the #if test for defining _ASMAPI (fixes IRIX problem)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5e83c2a081f4806c2ee0ecc9dd7f36feb4b2b20a;p=mesa.git

tweak the #if test for defining _ASMAPI (fixes IRIX problem)
---

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index a1dc0193039..a75c65dd4aa 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -20,9 +20,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.1
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -228,7 +228,7 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC
  * than GNU C
  */
 #ifndef _ASMAPI
-#if !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )
+#if defined(WIN32) && !defined(BUILD_FOR_SNAP)/* was: !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )*/
 #define _ASMAPI __cdecl
 #else
 #define _ASMAPI