[MPlayer-dev-eng] [PATCH] CPU detection related

[Rich Felker]

On Tue, Oct 18, 2005 at 10:18:18AM +0200, Diego Biurrun wrote:
> On Tue, Oct 18, 2005 at 07:37:09AM +0200, Guillaume POIRIER wrote:
> > 
> > On 10/18/05, Diego Biurrun <diego at biurrun.de> wrote:
> > > On Sun, Oct 16, 2005 at 08:43:27PM +0800, Zuxy wrote:
> > > > 2005/10/16, Vladimir Mosgalin <mosgalin at vm10124.spb.edu>:
> > > > >
> > > > > 2) WTF is "main.new\cpudetect.c"?? GNU patch (2.5.4) doesn't understand
> > > > >    stuff like this, I had to convert them to "/" manually. I strongly
> > > > >    suggest you to resend patch with correct dir separators.
> > > >
> > > > Just conventinal. I'm using mplayer under win32 and I'm developing
> > > > under mingw32.
> > >
> > > Then use Cygwin to create your patches.  That's how I work on Windows
> > > boxes.  Only compile under MinGW, do the rest under Cygwin.
> > >
> > > Patch rejected, I can't apply it.  Resend something sane.
> > 
> > The versions of patch that I use on my windows (mingw) or unix box
> > have no problem dealing with CR/LF line ending and "/" or "\" as
> > sub-directory separator.
> 
> Mine has and I cannot be bothered to investigate this in all details.

On unix, all files are binary. A patch line that says:

+ [stuff here] ^M

means add a line that actually contains a ^M at the end of it. If it
didn't work this way patch would not work on binary files.

On windows, text files are treated specially and using the basic text
tools on binary files will break horribly..

Rich