[arch-general] diff is going nuts

Ralf Mardorf ralf.mardorf at rocketmail.com
Sun Mar 22 13:45:32 UTC 2015


Hi,

for some time past I often need to replace diff with meld, since diff is
going nuts.

Today I noticed the most ridiculous thing.

Just the first line is different! [1] Nothing else is different, but
the complete file is listed.

Regards,
Ralf

[1]
[rocketmouse at archlinux energyXT27]$ pacman -Q diffutils
diffutils 3.3-2
[rocketmouse at archlinux energyXT27]$ pacman -Si diffutils | grep Ver
Version        : 3.3-2
[rocketmouse at archlinux energyXT27]$ diff jack.cpp.default jack.cpp
3c3
< // compile: g++ -shared -lasound -ljack jack.cpp -o /_path_to_energyXT2_/libaam.so
---
> // compile: g++ -shared -lasound -ljack jack.cpp -o /lib64/libaam.so
12,35c12,35
< const int STREAM_INIT = 0;          
< const int STREAM_OPEN = 1;          
< const int STREAM_CLOSE = 2;         
< //const int STREAM_PLAY = 3;
< //const int STREAM_STOP = 4;
< const int STREAM_EXIT = 5;          
< const int STREAM_ABOUT = 6;         
< const int STREAM_AUDIO_COUNT = 7;
< const int STREAM_AUDIO_NAME = 8;
< const int STREAM_FRAMES = 9;        
< const int STREAM_RATE = 10;         
< const int STREAM_LATENCY = 17;      
< const int STREAM_RELOAD = 18;				
< const int MIDI_IN_COUNT = 30;
< const int MIDI_IN_NAME = 31;
< const int MIDI_IN_ENABLE = 32;	
< const int MIDI_IN_ENABLED = 33;	
< const int AUDIO_IN_COUNT = 40;
< const int AUDIO_IN_NAME = 41;
< const int AUDIO_IN_ENABLE = 42;
< const int AUDIO_IN_ENABLED = 43;
< const int AUDIO_OUT_COUNT = 50;
< const int AUDIO_OUT_NAME = 51;
< const int AUDIO_OUT_ENABLE = 52;
---
> const int STREAM_INIT = 0;          
> const int STREAM_OPEN = 1;          
> const int STREAM_CLOSE = 2;         
> //const int STREAM_PLAY = 3;
> //const int STREAM_STOP = 4;
> const int STREAM_EXIT = 5;          
> const int STREAM_ABOUT = 6;         
> const int STREAM_AUDIO_COUNT = 7;
> const int STREAM_AUDIO_NAME = 8;
> const int STREAM_FRAMES = 9;        
> const int STREAM_RATE = 10;         
> const int STREAM_LATENCY = 17;      
> const int STREAM_RELOAD = 18;				
> const int MIDI_IN_COUNT = 30;
> const int MIDI_IN_NAME = 31;
> const int MIDI_IN_ENABLE = 32;	
> const int MIDI_IN_ENABLED = 33;	
> const int AUDIO_IN_COUNT = 40;
> const int AUDIO_IN_NAME = 41;
> const int AUDIO_IN_ENABLE = 42;
> const int AUDIO_IN_ENABLED = 43;
> const int AUDIO_OUT_COUNT = 50;
> const int AUDIO_OUT_NAME = 51;
> const int AUDIO_OUT_ENABLE = 52;
42,44c42,44
< class CThread
< {
<   public:
---
> class CThread
> {
>   public:
46,47c46,47
< 		pthread_t handle;
<     CThread();
---
> 		pthread_t handle;
>     CThread();
50c50
<     virtual void execute() {};
---
>     virtual void execute() {};
52,54c52,54
< 
< CThread :: CThread()
< {
---
> 
> CThread :: CThread()
> {
57,62d56
[snip]


More information about the arch-general mailing list