[gentoo-commits] gentoo-x86 commit in app-pda/coldsync/files: coldsync-2.2.5-toolchain.patch

[Samuli Suominen (ssuominen)]

ssuominen    11/03/31 05:49:22

  Added:                coldsync-2.2.5-toolchain.patch
  Log:
  Fix building with GCC 4.3+ and merge -broken-c++.diff and -gcc3.diff here. Keyword for ~amd64. Don't use strict aliasing. Respect CC and CXX wrt #243694 by Diego Elio Pettenò. Use perl-module.eclass wrt #297204 by Diego Elio Pettenò.
  
  (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-pda/coldsync/files/coldsync-2.2.5-toolchain.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/files/coldsync-2.2.5-toolchain.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/coldsync/files/coldsync-2.2.5-toolchain.patch?rev=1.1&content-type=text/plain

Index: coldsync-2.2.5-toolchain.patch
===================================================================
--- src/symboltable.cc
+++ src/symboltable.cc
@@ -11,8 +11,11 @@
 #include <string>
 #include <map>
 #include <cstdlib>		// For malloc() and friends
+#include <cstring>		// For strlen() and friends
 #include "symboltable.h"
 
+using namespace std;
+
 static char *make_c_string(const string &s);
 
 map<string,string> table;	/* XXX - Is this going to cause problems on
--- src/symboltable.h
+++ src/symboltable.h
@@ -26,7 +26,7 @@
 			/* Initialize the symbol table based on the
 			 * arguments. */
 #ifdef __cplusplus
-};
+}
 #endif	/* __cplusplus */
 
 /* This is for Emacs's benefit: