[med-svn] r2192 - trunk/packages/arb/trunk/debian/patches

[tille at alioth.debian.org]

Author: tille
Date: 2008-07-08 06:19:32 +0000 (Tue, 08 Jul 2008)
New Revision: 2192

Modified:
   trunk/packages/arb/trunk/debian/patches/10_gcc4.3.patch
Log:
Further include patches.  Hit a larger problem with name clash and need to ask for some hehelp of more skilled C++ person ...


Modified: trunk/packages/arb/trunk/debian/patches/10_gcc4.3.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/10_gcc4.3.patch	2008-07-08 06:09:47 UTC (rev 2191)
+++ trunk/packages/arb/trunk/debian/patches/10_gcc4.3.patch	2008-07-08 06:19:32 UTC (rev 2192)
@@ -51,8 +51,8 @@
  
  #include "awt.hxx"
  
-+#include <cstring> 
-+#include <memory> 
++#include <cstring>
++#include <memory>
  #include <string>
  #include <vector>
  #include <map>
@@ -151,9 +151,9 @@
  #include <cstdio>
  #include <cmath>
  #include <string>
-+#include <cstdlib> 
-+#include <cstring> 
-+#include <memory> 
++#include <cstdlib>
++#include <cstring>
++#include <memory>
  
  #include <arbdb.h>
  #include <arbdbt.h>
@@ -240,3 +240,45 @@
  
  #include <arbdb.h>
  
+--- arb-0.0.20071207.1.orig/PROBE_SERVER/PROBE_GROUP_DESIGN/pgd_main.cxx
++++ arb-0.0.20071207.1/PROBE_SERVER/PROBE_GROUP_DESIGN/pgd_main.cxx
+@@ -2,6 +2,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string>
++#include <cstring>
+ #include <set>
+ 
+ #include <arbdb.h>
+--- arb-0.0.20071207.1.orig/PROBE_SERVER/WORKER/psw_main.cxx
++++ arb-0.0.20071207.1/PROBE_SERVER/WORKER/psw_main.cxx
+@@ -15,6 +15,8 @@
+ 
+ #include <cstdio>
+ #include <string>
++#include <cstdlib>
++#include <cstring>
+ #include <queue>
+ #include <map>
+ #include <list>
+--- arb-0.0.20071207.1.orig/PROBE_SERVER/TREE_MERGE/tree_merge.cxx
++++ arb-0.0.20071207.1/PROBE_SERVER/TREE_MERGE/tree_merge.cxx
+@@ -20,6 +20,7 @@
+ #include <list>
+ 
+ #include <stdio.h>
++#include <cstdlib>
+ #include <arb_assert.h>
+ #define tm_assert(cond) arb_assert(cond)
+ 
+--- arb-0.0.20071207.1.orig/PROBE_SERVER/common.h
++++ arb-0.0.20071207.1/PROBE_SERVER/common.h
+@@ -17,6 +17,8 @@
+ #ifndef COMMON_H
+ #define COMMON_H
+ 
++#include <cstring>
++
+ #ifdef NEED_setDatabaseState
+ static GB_ERROR setDatabaseState(GBDATA *gb_main, const char *type, const char *state) {
+     GB_ERROR error = GB_push_transaction(gb_main);