diff options
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 10 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Main.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 4f14a7bd3c3..d4904cd6ba1 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -646,7 +646,7 @@ Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p) C << nl << "while (sz--)"; C << sb; C.zeroIndent(); - C << nl << "#ifdef WIN32"; // STLBUG + C << nl << "#ifdef _WIN32"; // STLBUG C.restoreIndent(); C << nl << "v.push_back(" << typeToString(type) << "());"; C.zeroIndent(); @@ -680,7 +680,7 @@ Slice::Gen::TypesVisitor::visitSequence(const SequencePtr& p) C << nl << "while (sz--)"; C << sb; C.zeroIndent(); - C << nl << "#ifdef WIN32"; // STLBUG + C << nl << "#ifdef _WIN32"; // STLBUG C.restoreIndent(); C << nl << "v.push_back(" << typeToString(type) << "());"; C.zeroIndent(); @@ -944,7 +944,7 @@ Slice::Gen::TypesVisitor::emitExceptionBase(const ExceptionPtr& base, const std: if (base) { C.zeroIndent(); - C << nl << "#ifdef WIN32"; // COMPILERBUG + C << nl << "#ifdef _WIN32"; // COMPILERBUG C.restoreIndent(); C << nl << base->name() << "::" << call << ";"; C.zeroIndent(); @@ -2329,7 +2329,7 @@ Slice::Gen::ObjectVisitor::emitClassBase(const ClassDefPtr& base, const std::str if (base) { C.zeroIndent(); - C << nl << "#ifdef WIN32"; // COMPILERBUG + C << nl << "#ifdef _WIN32"; // COMPILERBUG C.restoreIndent(); C << nl << base->name() << "::" << call << ";"; C.zeroIndent(); @@ -2343,7 +2343,7 @@ Slice::Gen::ObjectVisitor::emitClassBase(const ClassDefPtr& base, const std::str else { C.zeroIndent(); - C << nl << "#ifdef WIN32"; // COMPILERBUG + C << nl << "#ifdef _WIN32"; // COMPILERBUG C.restoreIndent(); C << nl << "Object::" << call << ";"; C.zeroIndent(); diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index d8a9ea8d2a1..8d8c02dee57 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -199,7 +199,7 @@ main(int argc, char* argv[]) test.close(); string cmd = cpp + " " + argv[idx]; -#ifdef WIN32 +#ifdef _WIN32 FILE* cppHandle = _popen(cmd.c_str(), "r"); #else FILE* cppHandle = popen(cmd.c_str(), "r"); @@ -213,7 +213,7 @@ main(int argc, char* argv[]) UnitPtr unit = Unit::createUnit(false, false); int parseStatus = unit->parse(cppHandle, debug); -#ifdef WIN32 +#ifdef _WIN32 _pclose(cppHandle); #else pclose(cppHandle); |