Committing in .

 The latest version of the OpenVMS DECCRTL contains (v)snprintf
 If this one is beeing used the (v)snprintf routines are not compiled in
 from mesa's source.

 Modified Files:
 	Mesa-newtree/src/mesa/main/descrip.mms
 	Mesa-newtree/src/mesa/main/imports.c
 ----------------------------------------------------------------------

diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
index 41b5fe52e2bc29f964b639395098f98ca67425ca..aa08f3f2e098a55986f35954fac6f9dae10bb8b1 100644 (file)
--- a/src/mesa/main/descrip.mms
+++ b/src/mesa/main/descrip.mms
@@ -71,8 +71,7 @@ SOURCES =accum.c \
        texstore.c \
        texutil.c \
        varray.c \
-       vtxfmt.c \
-       vsnprintf.c
+       vtxfmt.c
 
 OBJECTS=accum.obj,\
 api_loopback.obj,\
@@ -129,8 +128,7 @@ texstate.obj,\
 texstore.obj,\
 texutil.obj,\
 varray.obj,\
-vtxfmt.obj,\
-vsnprintf.obj
+vtxfmt.obj
 
 ##### RULES #####
 
@@ -177,7 +175,7 @@ hash.obj : hash.c
 hint.obj : hint.c
 histogram.obj : histogram.c
 image.obj : image.c
-imports.obj : imports.c
+imports.obj : imports.c vsnprintf.c
 light.obj : light.c
 lines.obj : lines.c
 matrix.obj : matrix.c
@@ -202,4 +200,3 @@ texstore.obj : texstore.c
 texutil.obj : texutil.c
 varray.obj : varray.c
 vtxfmt.obj : vtxfmt.c
-vsnprintf.obj : vsnprintf.c

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 41179f4d940bce310058e18d5c1127576fba4d36..6420303a4ee9db184d5af3a5fda2ca47be518ddd 100644 (file)
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -64,8 +64,11 @@
 
 #ifdef WIN32
 #define vsnprintf _vsnprintf
-#elif defined(__IBMC__) || defined(__IBMCPP__) || defined(VMS)
+#elif defined(__IBMC__) || defined(__IBMCPP__) || ( defined(__VMS) && __CRTL_VER < 70312000 )
 extern int vsnprintf(char *str, size_t count, const char *fmt, va_list arg);
+#ifdef __VMS
+#include "vsnprintf.c"
+#endif
 #endif