diff options
| author | Jouk Jansen <joukj@hrem.stm.tudelft.nl> | 2003-10-21 10:12:47 +0000 |
|---|---|---|
| committer | Jouk Jansen <joukj@hrem.stm.tudelft.nl> | 2003-10-21 10:12:47 +0000 |
| commit | 1d61db5f314e7b7e2f1ab4a5cb4452f6a458ed34 (patch) | |
| tree | 52dad9d38d73e29f0949b61a0b61f6d96e9ec13d /src | |
| parent | 6d4afe2a959f9ce7733ab50d032402c60610fbda (diff) | |
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
----------------------------------------------------------------------
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/descrip.mms | 9 | ||||
| -rw-r--r-- | src/mesa/main/imports.c | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms index 41b5fe52e2..aa08f3f2e0 100644 --- 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 41179f4d94..6420303a4e 100644 --- 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 |