restore FASTCALL stuff
diff --git a/src/mesa/glapi/gl_XML.py b/src/mesa/glapi/gl_XML.py
index 0cea268..11b23b7 100644
--- a/src/mesa/glapi/gl_XML.py
+++ b/src/mesa/glapi/gl_XML.py
@@ -194,9 +194,11 @@
 		"""
 
 		self.undef_list.append("FASTCALL")
-		# I've removed the previous code for __attribute__((fastcall))
-		# because it breaks server-side GLX. (BrianP)
-		print "#define FASTCALL"
+		print """#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#    define FASTCALL __attribute__((fastcall))
+#  else
+#    define FASTCALL
+#  endif"""
 		return