From 8f153c6128dd15fb132d8ddb1752e793bd6a5985 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Sep 2006 22:49:20 +0000 Subject: r18644: bring in libreplace in lib/replace metze (This used to be commit 596cbe73dd268742acf456fccd8a234376fb0c97) --- source3/lib/replace/system/iconv.h | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 source3/lib/replace/system/iconv.h (limited to 'source3/lib/replace/system/iconv.h') diff --git a/source3/lib/replace/system/iconv.h b/source3/lib/replace/system/iconv.h new file mode 100644 index 0000000000..75ee1d83ba --- /dev/null +++ b/source3/lib/replace/system/iconv.h @@ -0,0 +1,40 @@ +#ifndef _system_iconv_h +#define _system_iconv_h +/* + Unix SMB/CIFS implementation. + + iconv memory system include wrappers + + Copyright (C) Andrew Tridgell 2004 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifdef HAVE_NATIVE_ICONV +#ifdef HAVE_ICONV_H +#include +#endif +#ifdef HAVE_GICONV_H +#include +#endif +#endif + +/* needed for some systems without iconv. Doesn't really matter + what error code we use */ +#ifndef EILSEQ +#define EILSEQ EIO +#endif + +#endif -- cgit From 3fe99c960f7c99e421d000f3c29114b94c182ca8 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 19 Sep 2006 02:03:15 +0000 Subject: r18669: fix the samba3 build... we need to move the iconv configure checks to libreplace... metze (This used to be commit 6b53ed8fdc2a4c0b3b24e22ada90d14d60cc93fb) --- source3/lib/replace/system/iconv.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source3/lib/replace/system/iconv.h') diff --git a/source3/lib/replace/system/iconv.h b/source3/lib/replace/system/iconv.h index 75ee1d83ba..fcd3199680 100644 --- a/source3/lib/replace/system/iconv.h +++ b/source3/lib/replace/system/iconv.h @@ -23,12 +23,15 @@ */ #ifdef HAVE_NATIVE_ICONV -#ifdef HAVE_ICONV_H +#ifdef HAVE_ICONV #include #endif -#ifdef HAVE_GICONV_H +#ifdef HAVE_GICONV #include #endif +#ifdef HAVE_BICONV +#include +#endif #endif /* needed for some systems without iconv. Doesn't really matter -- cgit From 1b80624c57cdd71a2f421ebe399416580d8d87b9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 6 Oct 2006 10:58:39 +0000 Subject: r19121: try to get rid of the difference between in system/iconv.h between samba 3 and 4. metze (This used to be commit 04031a9fca037ad77cca0ba0da6801d5017521ba) --- source3/lib/replace/system/iconv.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'source3/lib/replace/system/iconv.h') diff --git a/source3/lib/replace/system/iconv.h b/source3/lib/replace/system/iconv.h index fcd3199680..abc2d6f4e1 100644 --- a/source3/lib/replace/system/iconv.h +++ b/source3/lib/replace/system/iconv.h @@ -22,17 +22,27 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#if !defined(HAVE_ICONV) && defined(HAVE_ICONV_H) +#define HAVE_ICONV +#endif + +#if !defined(HAVE_GICONV) && defined(HAVE_GICONV_H) +#define HAVE_GICONV +#endif + +#if !defined(HAVE_BICONV) && defined(HAVE_BICONV_H) +#define HAVE_BICONV +#endif + #ifdef HAVE_NATIVE_ICONV -#ifdef HAVE_ICONV +#if defined(HAVE_ICONV) #include -#endif -#ifdef HAVE_GICONV +#elif defined(HAVE_GICONV) #include -#endif -#ifdef HAVE_BICONV +#elif defined(HAVE_BICONV) #include #endif -#endif +#endif /* HAVE_NATIVE_ICONV */ /* needed for some systems without iconv. Doesn't really matter what error code we use */ -- cgit From e893d7f021d149803aa85e347e0a8acefde210ac Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 2 Jun 2007 09:10:08 +0000 Subject: r23309: sync lib/replace with SAMBA_4_0 metze (This used to be commit 20965d800fcac0c55853fb12cdd36b5836fc7e56) --- source3/lib/replace/system/iconv.h | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'source3/lib/replace/system/iconv.h') diff --git a/source3/lib/replace/system/iconv.h b/source3/lib/replace/system/iconv.h index abc2d6f4e1..2b2832a796 100644 --- a/source3/lib/replace/system/iconv.h +++ b/source3/lib/replace/system/iconv.h @@ -7,19 +7,24 @@ Copyright (C) Andrew Tridgell 2004 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + ** NOTE! The following LGPL license applies to the replace + ** library. This does NOT imply that all of Samba is released + ** under the LGPL - This program is distributed in the hope that it will be useful, + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #if !defined(HAVE_ICONV) && defined(HAVE_ICONV_H) -- cgit From 2c09988e46d4e917b1c53c9bda3f81a48bba4952 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 01:44:42 +0000 Subject: r23790: LGPLv3+ conversion for our LGPLv2+ library code (This used to be commit 1b78cace504f60c0f525765fbf59d9cc6506cd4d) --- source3/lib/replace/system/iconv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/replace/system/iconv.h') diff --git a/source3/lib/replace/system/iconv.h b/source3/lib/replace/system/iconv.h index 2b2832a796..a7299799d1 100644 --- a/source3/lib/replace/system/iconv.h +++ b/source3/lib/replace/system/iconv.h @@ -14,7 +14,7 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -- cgit From 9fa1c63578733077c0aaaeeb2fc97c3b191089cc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 03:42:26 +0000 Subject: r23798: updated old Temple Place FSF addresses to new URL (This used to be commit c676a971142d7176fd5dbf21405fca14515a0a76) --- source3/lib/replace/system/iconv.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/lib/replace/system/iconv.h') diff --git a/source3/lib/replace/system/iconv.h b/source3/lib/replace/system/iconv.h index a7299799d1..3c8a71f2f7 100644 --- a/source3/lib/replace/system/iconv.h +++ b/source3/lib/replace/system/iconv.h @@ -22,8 +22,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; if not, see . */ -- cgit