Skip to content

Commit d027b5e

Browse files
committed
update bundled libs
1 parent 6525aa7 commit d027b5e

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

extern/btyacc/defs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ extern Yshort nunused;
297297
extern Yshort final_state;
298298

299299
/* system variable */
300-
#ifndef _MSC_VER
300+
#ifndef _WIN32
301301
extern int errno;
302302
#endif
303303

extern/btyacc/mkpar.c

+2
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,12 @@ void unused_rules()
177177
if (!rules_used[i]) ++nunused;
178178

179179
if (nunused)
180+
{
180181
if (nunused == 1)
181182
fprintf(stderr, "%s: 1 rule never reduced\n", myname);
182183
else
183184
fprintf(stderr, "%s: %d rules never reduced\n", myname, nunused);
185+
}
184186
}
185187

186188

extern/cloop/src/cloop/Main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <string>
2929
#include <stdexcept>
3030

31-
using std::auto_ptr;
31+
using std::unique_ptr;
3232
using std::cerr;
3333
using std::endl;
3434
using std::exception;
@@ -66,7 +66,7 @@ static void run(int argc, const char* argv[])
6666
Parser parser(&lexer);
6767
parser.parse();
6868

69-
auto_ptr<Generator> generator;
69+
unique_ptr<Generator> generator;
7070

7171
if (outFormat == "c++")
7272
{

extern/ttmath/ttmathtypes.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ namespace ttmath
158158
/*!
159159
on 32 bit platform ulint and slint will be equal 64 bits
160160
*/
161-
#ifdef _MSC_VER
161+
#ifdef _WIN32
162162
// long long on MS Windows (Visual and GCC mingw compilers) have 64 bits
163163
// stdint.h is not available on Visual Studio prior to VS 2010 version
164164
typedef unsigned long long int ulint;
@@ -205,7 +205,7 @@ namespace ttmath
205205
/*!
206206
on 64bit platforms one word (uint, sint) will be equal 64bits
207207
*/
208-
#ifdef _MSC_VER
208+
#ifdef _WIN32
209209
/* in VC 'long' type has 32 bits, __int64 is VC extension */
210210
typedef unsigned __int64 uint;
211211
typedef signed __int64 sint;

0 commit comments

Comments
 (0)