Those checks account for compiler changes/improvements introduced in Visual Studio 2010 that are not present in Visual Studio 2008. I will grab Visual Studio 2012 off of MSDN and make sure everything is OK there. -Ben> Hi Ben, > > Can you please remove the _MSC_VER >= 1600 check? > > _MSC_VER 1600 is set for Visual Studio 2010, which means > that Visual Studio 2012 will get a lot of errors because _MSC_VER > is defined as 1700. > > Cheers, > Cristian. > > On Wed, Mar 6, 2013 at 5:53 PM, Ben Allison <benski at winamp.com> wrote: > >> Thanks, Erik. >> >> This is the delta that should fix everything up. >> I hope that #include "share/compat.h" is acceptable from the >> test_streams >> binary. If not, you can probably change it to FLAC/ordinals.h instead >> >> Also don't forget to commit my earlier VERSION="1.3.0" patch. You can >> add >> the "pre1" in a normal text editor without risk. I didn't include those >> changes in the big patch you committed already. >> -Ben >> >> > Ben Allison wrote: >> > >> >> Erik, et al. >> >> >> >> This fixes the entire library and does it more cleanly. It puts most >> of >> >> the guts into share/compat.h >> > >> > Thanks Ben. >> > >> > I applied a slightly tweaked version of the patch. The patch had to be >> > tweaked because it broke the Linux build :-). Specifically, the file >> > include/FLAC/ordinals.h is a public header file and should not include >> > the project internal header "share/compat.h". I also moved some of the >> > #ifdef stuff to "share/compat.h". >> > >> > What is in git now may not build on windows but should be really, >> really >> > close. I'd appreciate it if you could test it and report the error >> > messages. It might take a couple of iterations but we should get it >> > working for all the platforms. >> > >> > Cheers, >> > Erik >> > -- >> > ---------------------------------------------------------------------- >> > Erik de Castro Lopo >> > http://www.mega-nerd.com/ >> > _______________________________________________ >> > flac-dev mailing list >> > flac-dev at xiph.org >> > http://lists.xiph.org/mailman/listinfo/flac-dev >> > >> >> _______________________________________________ >> flac-dev mailing list >> flac-dev at xiph.org >> http://lists.xiph.org/mailman/listinfo/flac-dev >> >> >
Great. I need to correct my statement, the check for _MSC_VER <= 1600 was the culprit, like this case: #if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ #include <sys/types.h> /* for off_t */ #if _MSC_VER <= 1600 || defined __BORLANDC__ /* @@@ [2G limit] */ #ifndef fseeko #define fseeko fseek #ifndef fseeko #define fseeko fseek #endif #endif Cheers, Cristian. On Wed, Mar 6, 2013 at 6:24 PM, Ben Allison <benski at winamp.com> wrote:> Those checks account for compiler changes/improvements introduced in > Visual Studio 2010 that are not present in Visual Studio 2008. > > I will grab Visual Studio 2012 off of MSDN and make sure everything is OK > there. > > -Ben > > > Hi Ben, > > > > Can you please remove the _MSC_VER >= 1600 check? > > > > _MSC_VER 1600 is set for Visual Studio 2010, which means > > that Visual Studio 2012 will get a lot of errors because _MSC_VER > > is defined as 1700. > > > > Cheers, > > Cristian. > > > > On Wed, Mar 6, 2013 at 5:53 PM, Ben Allison <benski at winamp.com> wrote: > > > >> Thanks, Erik. > >> > >> This is the delta that should fix everything up. > >> I hope that #include "share/compat.h" is acceptable from the > >> test_streams > >> binary. If not, you can probably change it to FLAC/ordinals.h instead > >> > >> Also don't forget to commit my earlier VERSION="1.3.0" patch. You can > >> add > >> the "pre1" in a normal text editor without risk. I didn't include those > >> changes in the big patch you committed already. > >> -Ben > >> > >> > Ben Allison wrote: > >> > > >> >> Erik, et al. > >> >> > >> >> This fixes the entire library and does it more cleanly. It puts most > >> of > >> >> the guts into share/compat.h > >> > > >> > Thanks Ben. > >> > > >> > I applied a slightly tweaked version of the patch. The patch had to be > >> > tweaked because it broke the Linux build :-). Specifically, the file > >> > include/FLAC/ordinals.h is a public header file and should not include > >> > the project internal header "share/compat.h". I also moved some of the > >> > #ifdef stuff to "share/compat.h". > >> > > >> > What is in git now may not build on windows but should be really, > >> really > >> > close. I'd appreciate it if you could test it and report the error > >> > messages. It might take a couple of iterations but we should get it > >> > working for all the platforms. > >> > > >> > Cheers, > >> > Erik > >> > -- > >> > ---------------------------------------------------------------------- > >> > Erik de Castro Lopo > >> > http://www.mega-nerd.com/ > >> > _______________________________________________ > >> > flac-dev mailing list > >> > flac-dev at xiph.org > >> > http://lists.xiph.org/mailman/listinfo/flac-dev > >> > > >> > >> _______________________________________________ > >> flac-dev mailing list > >> flac-dev at xiph.org > >> http://lists.xiph.org/mailman/listinfo/flac-dev > >> > >> > > > >-------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.xiph.org/pipermail/flac-dev/attachments/20130306/251e0dd3/attachment-0001.htm
This should be enough to fix it> Great. > > I need to correct my statement, the check for _MSC_VER <= 1600 > was the culprit, like this case: > > #if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ > #include <sys/types.h> /* for off_t */ > #if _MSC_VER <= 1600 || defined __BORLANDC__ /* @@@ [2G limit] */ > #ifndef fseeko > #define fseeko fseek > #ifndef fseeko > #define fseeko fseek > #endif > #endif > > Cheers, > Cristian. > > On Wed, Mar 6, 2013 at 6:24 PM, Ben Allison <benski at winamp.com> wrote: > >> Those checks account for compiler changes/improvements introduced in >> Visual Studio 2010 that are not present in Visual Studio 2008. >> >> I will grab Visual Studio 2012 off of MSDN and make sure everything is >> OK >> there. >> >> -Ben >> >> > Hi Ben, >> > >> > Can you please remove the _MSC_VER >= 1600 check? >> > >> > _MSC_VER 1600 is set for Visual Studio 2010, which means >> > that Visual Studio 2012 will get a lot of errors because _MSC_VER >> > is defined as 1700. >> > >> > Cheers, >> > Cristian. >> > >> > On Wed, Mar 6, 2013 at 5:53 PM, Ben Allison <benski at winamp.com> wrote: >> > >> >> Thanks, Erik. >> >> >> >> This is the delta that should fix everything up. >> >> I hope that #include "share/compat.h" is acceptable from the >> >> test_streams >> >> binary. If not, you can probably change it to FLAC/ordinals.h >> instead >> >> >> >> Also don't forget to commit my earlier VERSION="1.3.0" patch. You >> can >> >> add >> >> the "pre1" in a normal text editor without risk. I didn't include >> those >> >> changes in the big patch you committed already. >> >> -Ben >> >> >> >> > Ben Allison wrote: >> >> > >> >> >> Erik, et al. >> >> >> >> >> >> This fixes the entire library and does it more cleanly. It puts >> most >> >> of >> >> >> the guts into share/compat.h >> >> > >> >> > Thanks Ben. >> >> > >> >> > I applied a slightly tweaked version of the patch. The patch had to >> be >> >> > tweaked because it broke the Linux build :-). Specifically, the >> file >> >> > include/FLAC/ordinals.h is a public header file and should not >> include >> >> > the project internal header "share/compat.h". I also moved some of >> the >> >> > #ifdef stuff to "share/compat.h". >> >> > >> >> > What is in git now may not build on windows but should be really, >> >> really >> >> > close. I'd appreciate it if you could test it and report the error >> >> > messages. It might take a couple of iterations but we should get it >> >> > working for all the platforms. >> >> > >> >> > Cheers, >> >> > Erik >> >> > -- >> >> > ---------------------------------------------------------------------- >> >> > Erik de Castro Lopo >> >> > http://www.mega-nerd.com/ >> >> > _______________________________________________ >> >> > flac-dev mailing list >> >> > flac-dev at xiph.org >> >> > http://lists.xiph.org/mailman/listinfo/flac-dev >> >> > >> >> >> >> _______________________________________________ >> >> flac-dev mailing list >> >> flac-dev at xiph.org >> >> http://lists.xiph.org/mailman/listinfo/flac-dev >> >> >> >> >> > >> >> >-------------- next part -------------- A non-text attachment was scrubbed... Name: MSVC-VS2012.patch Type: application/octet-stream Size: 516 bytes Desc: not available Url : http://lists.xiph.org/pipermail/flac-dev/attachments/20130306/b9aadbb4/attachment.obj