[Pkg-voip-commits] r1123 - stun/trunk/debian/patches

[Kilian Krause]

Author: kilian
Date: 2006-01-03 00:49:25 +0000 (Tue, 03 Jan 2006)
New Revision: 1123

Modified:
   stun/trunk/debian/patches/fix_non_i386.dpatch
Log:
fix patch applying


Modified: stun/trunk/debian/patches/fix_non_i386.dpatch
===================================================================
--- stun/trunk/debian/patches/fix_non_i386.dpatch	2006-01-03 00:29:09 UTC (rev 1122)
+++ stun/trunk/debian/patches/fix_non_i386.dpatch	2006-01-03 00:49:25 UTC (rev 1123)
@@ -4,24 +4,24 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Remove i386-only code analogous to twinkle
 @DPATCH@
---- stun-0.96.orig/stun.cxx
-+++ stun-0.96/stun.cxx
-@@ -669,16 +669,8 @@
+diff -urNad stun-0.96~/stun.cxx stun-0.96/stun.cxx
+--- stun-0.96~/stun.cxx	2005-08-14 00:39:03.000000000 +0000
++++ stun-0.96/stun.cxx	2006-01-03 00:48:47.000000000 +0000
+@@ -669,17 +669,6 @@
        tick = hightick;
        tick <<= 32;
        tick |= lowtick;
 -#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) )
 -      asm("rdtsc" : "=A" (tick));
--#elif defined (__SUNPRO_CC) || defined( __sparc__ )
+-#elif defined (__SUNPRO_CC) || defined( __sparc__ )	
 -      tick = gethrtime();
--#elif defined(__MACH__)
+-#elif defined(__MACH__) 
 -      int fd=open("/dev/random",O_RDONLY);
 -      read(fd,&tick,sizeof(tick));
 -      closesocket(fd);
- #else
--#     error Need some way to seed the random number generator
-+      tick = time(NULL);
- #endif
+-#else
+-#     error Need some way to seed the random number generator 
+-#endif 
        int seed = int(tick);
  #ifdef WIN32
-
+       srand(seed);