renamed CURRENT_INPUT to _mesa_CurrentInput

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 5645026761fb0af42158726d5e89e600479c8ba9..82b8e0f0045ba6c8a3973e48b274ace727dee6d2 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.32 2000/01/17 20:00:15 brianp Exp $ */
+/* $Id: context.c,v 1.33 2000/01/18 17:36:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -85,7 +85,7 @@
 
 #if !defined(THREADS)
 
-struct immediate *CURRENT_INPUT = NULL;
+struct immediate *_mesa_CurrentInput = NULL;
 
 #endif
 

diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 237b3184408c0a43f65b1b27cb92a340fef18c75..97e9d6a80827ff66d52c2646266b21588338e370 100644 (file)
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -1,10 +1,10 @@
-/* $Id: context.h,v 1.10 2000/01/14 04:45:47 brianp Exp $ */
+/* $Id: context.h,v 1.11 2000/01/18 17:36:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  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"),
@@ -140,16 +140,16 @@ do {                                      \
 
 #else
 
-extern struct immediate *CURRENT_INPUT;
+extern struct immediate *_mesa_CurrentInput;
 
 #define GET_CURRENT_CONTEXT(C)  GLcontext *C = _glapi_CurrentContext
 
-#define GET_IMMEDIATE struct immediate *IM = CURRENT_INPUT
+#define GET_IMMEDIATE struct immediate *IM = _mesa_CurrentInput
 
 #define SET_IMMEDIATE(ctx, im)         \
 do {                                   \
    ctx->input = im;                    \
-   CURRENT_INPUT = im;                 \
+   _mesa_CurrentInput = im;            \
 } while (0)
 
 #endif