luke
/
icestorm
mirror of https://github.com/YosysHQ/icestorm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaned up VS2013 fixes

This commit is contained in:
Clifford Wolf 2015-08-21 19:50:52 +02:00
parent 24f521e1c4
commit d094abca1c
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
icepack/icepack.cc
View File

@ -22,20 +22,15 @@
#include <string>
#include <fstream>
#include <iostream>
#include <algorithm>
#include <sstream>
#include <cstdint>
#include <stdio.h>
#include <stdarg.h>
/*
* needed for VS2013 at least
*/
#ifdef _WIN32
#define __PRETTY_FUNCTION__ __FUNCTION__
#include <algorithm>
#endif
@ -1139,16 +1134,7 @@ int main(int argc, char **argv)
std::ostream *osp;
if (parameters.size() >= 1 && parameters[0] != "-") {
/* VS2013 would open .bin file as ascii */
#ifdef _WIN32
ifs.open(parameters[0], std::ios::binary);
#else
ifs.open(parameters[0]);
#endif
if (!ifs.is_open())
error("Failed to open input file.\n");
isp = &ifs;
@ -1157,7 +1143,7 @@ int main(int argc, char **argv)
}
if (parameters.size() >= 2 && parameters[1] != "-") {
ofs.open(parameters[1]);
ofs.open(parameters[1], std::ios::binary);
if (!ofs.is_open())
error("Failed to open output file.\n");
osp = &ofs;