summaryrefslogtreecommitdiff
path: root/src/mesa/math
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/math')
-rw-r--r--src/mesa/math/m_trans_tmp.h27
-rw-r--r--src/mesa/math/m_translate.c8
2 files changed, 27 insertions, 8 deletions
diff --git a/src/mesa/math/m_trans_tmp.h b/src/mesa/math/m_trans_tmp.h
index 9020bcadda..2ade71e4b6 100644
--- a/src/mesa/math/m_trans_tmp.h
+++ b/src/mesa/math/m_trans_tmp.h
@@ -1,10 +1,8 @@
-/* $Id: m_trans_tmp.h,v 1.7 2002/01/30 16:52:02 brianp Exp $ */
-
/*
* Mesa 3-D graphics library
- * Version: 4.0.2
+ * Version: 5.1
*
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 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"),
@@ -224,13 +222,34 @@ static void INIT(void)
}
+#ifdef INIT
#undef INIT
+#endif
+#ifdef DEST_1UI
#undef DEST_1UI
+#endif
+#ifdef DEST_1UB
#undef DEST_1UB
+#endif
+#ifdef DEST_4UB
#undef DEST_4UB
+#endif
+#ifdef DEST_4US
#undef DEST_4US
+#endif
+#ifdef DEST_3F
#undef DEST_3F
+#endif
+#ifdef DEST_4F
#undef DEST_4F
+#endif
+#ifdef DEST_1F
#undef DEST_1F
+#endif
+#ifdef SZ
#undef SZ
+#endif
+#ifdef TAG
#undef TAG
+#endif
+
diff --git a/src/mesa/math/m_translate.c b/src/mesa/math/m_translate.c
index 0c4a1b1631..def657e1c8 100644
--- a/src/mesa/math/m_translate.c
+++ b/src/mesa/math/m_translate.c
@@ -1,10 +1,8 @@
-/* $Id: m_translate.c,v 1.11 2003/03/01 01:50:24 brianp Exp $ */
-
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 5.1
*
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 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"),
@@ -550,7 +548,9 @@ static void init_translate_raw(void)
#undef TAB
+#ifdef CLASS
#undef CLASS
+#endif
#undef ARGS
#undef CHECK
#undef SRC_START