Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[packages] uclibc++: remove conflicting inline declarations

git-svn-id: svn://svn.openwrt.org/openwrt/packages@30953 3c298f89-4303-0410-b956-a3cf2f4a3e73
  • Loading branch information...
commit 505107f9e6dd99feab40a3f10ae0ab8dad0f7f60 1 parent 066f726
jow authored
4 libs/uclibc++/Makefile
... ... @@ -1,5 +1,5 @@
1 1 #
2   -# Copyright (C) 2006-2010 OpenWrt.org
  2 +# Copyright (C) 2006-2012 OpenWrt.org
3 3 #
4 4 # This is free software, licensed under the GNU General Public License v2.
5 5 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
9 9
10 10 PKG_NAME:=uclibc++
11 11 PKG_VERSION:=0.2.2
12   -PKG_RELEASE:=3
  12 +PKG_RELEASE:=4
13 13
14 14 PKG_SOURCE:=uClibc++-$(PKG_VERSION).tar.bz2
15 15 PKG_SOURCE_URL:=http://cxx.uclibc.org/src/
34 libs/uclibc++/patches/010-cstring_conflicts.patch
... ... @@ -0,0 +1,34 @@
  1 +--- a/include/cstring
  2 ++++ b/include/cstring
  3 +@@ -47,31 +47,6 @@ namespace std{
  4 + using ::strstr;
  5 + using ::strtok;
  6 + using ::strxfrm;
  7 +-
  8 +-
  9 +- //Extra definitions required in c++ spec
  10 +-
  11 +-
  12 +- inline void* memchr(void* s, int c, size_t n){
  13 +- return memchr(const_cast<const void *>(s), c, n);
  14 +- }
  15 +-
  16 +- inline char* strchr(char* s, int c){
  17 +- return strchr(const_cast<const char *>(s), c);
  18 +- }
  19 +-
  20 +- inline char* strpbrk(char* s1, const char* s2){
  21 +- return strpbrk(const_cast<const char *>(s1), s2);
  22 +- }
  23 +-
  24 +- inline char* strrchr(char* s, int c){
  25 +- return strrchr(const_cast<const char *>(s), c);
  26 +- }
  27 +-
  28 +- inline char* strstr(char* s1, const char* s2){
  29 +- return strstr(const_cast<const char *>(s1), s2);
  30 +- }
  31 +-
  32 + }
  33 +
  34 + #endif

0 comments on commit 505107f

Please sign in to comment.
Something went wrong with that request. Please try again.