Anubis / Anubis

Commit ccdf76246d5591c4b073137d012a3cd45acba640

Authored by David René
1 parent ea60ac9b

Return to 1.6.0.8 version. Now we have the complete absolute path in output error line

Showing 2 changed files with 7 additions and 6 deletions   Show diff stats
Inline Side-by-side
anubis_dev/compiler/proj/win32/compiler.dsp
  Show/Hide comments   View file @ccdf762
... ... @@ -438,10 +438,6 @@ SOURCE=..\..\..\include\FileIO.h
438 438 # End Source File
439 439 # Begin Source File
440 440  
441   -SOURCE=..\..\..\include\general.h
442   -# End Source File
443   -# Begin Source File
444   -
445 441 SOURCE=..\..\src\grammar.tab.h
446 442 # End Source File
447 443 # Begin Source File
... ...
anubis_dev/share/String.cpp
  Show/Hide comments   View file @ccdf762
... ... @@ -7,8 +7,13 @@
7 7 #include <stdio.h>
8 8 #include <stdlib.h>
9 9  
  10 +#ifdef WIN32
  11 +#define vsnprintf _vsnprintf
  12 +#endif
  13 +
10 14 BEGIN_NAMESPACE(CM);
11 15  
  16 +
12 17 String :: ~String()
13 18 {
14 19 if (_buffer != _smallBuffer)
... ... @@ -684,7 +689,7 @@ int String::PrintfV(const char * format, va_list argptr)
684 689  
685 690 // NB: _vsnprintf() may return either less than the buffer size or -1 if
686 691 // there is not enough place depending on implementation
687   - int iLen = _vsnprintf(szScratch, 1024, format, argptr);
  692 + int iLen = vsnprintf(szScratch, 1024, format, argptr);
688 693 if ( iLen != -1 ) {
689 694 // the whole string is in szScratch
690 695 *this = szScratch;
... ... @@ -695,7 +700,7 @@ int String::PrintfV(const char * format, va_list argptr)
695 700 while ( !outOfMemory ) {
696 701 char *buf = (char*)malloc(size);
697 702 if ( buf )
698   - iLen = _vsnprintf(buf, size, format, argptr);
  703 + iLen = vsnprintf(buf, size, format, argptr);
699 704 else
700 705 outOfMemory = true;
701 706  
... ...