rpms/dasher/devel dasher-3.99.1-c++.patch, NONE, 1.1 dasher.spec, 1.20, 1.21

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16059

Modified Files:
	dasher.spec 
Added Files:
	dasher-3.99.1-c++.patch 
Log Message:
Try to fix some C++


dasher-3.99.1-c++.patch:
 Common/Types/int.h       |    2 ++
 DasherCore/SocketInput.h |    1 +
 2 files changed, 3 insertions(+)

--- NEW FILE dasher-3.99.1-c++.patch ---
--- dasher-3.99.1/Src/DasherCore/SocketInput.h.c++	2006-01-16 21:21:29.000000000 -0500
+++ dasher-3.99.1/Src/DasherCore/SocketInput.h	2006-01-16 21:22:55.000000000 -0500
@@ -31,6 +31,7 @@
     // don't know how this interacts with recv blocking
 
     myClass->ReadForever();
+    return NULL;
   }
 
 public:
--- dasher-3.99.1/Src/Common/Types/int.h.c++	2006-01-16 21:17:17.000000000 -0500
+++ dasher-3.99.1/Src/Common/Types/int.h	2006-01-16 21:17:45.000000000 -0500
@@ -33,8 +33,10 @@
 typedef int int32;
 typedef unsigned int uint32;
 
+#ifndef LLONG_MAX
 #define LLONG_MAX 9223372036854775807LL
 #define LLONG_MIN (-LLONG_MAX - 1LL)
+#endif
 
 #endif
 


Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dasher.spec	17 Jan 2006 02:04:55 -0000	1.20
+++ dasher.spec	17 Jan 2006 02:25:35 -0000	1.21
@@ -7,6 +7,7 @@
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Patch0: dasher-3.99.1-export.patch
+Patch1: dasher-3.99.1-c++.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: gnome-speech-devel
@@ -25,6 +26,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .export
+%patch1 -p1 -b .c++
 
 %build