Merge branch 'master' of https://github.com/jens-maus/libcodesets

tboeckel · tboeckel · commit 1dd4e398f0a8 · 2018-01-16T08:15:29.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,8 @@
 codesets.library - Library for handling different codesets
 ----------------------------------------------------------
 
+#### 6.21 RELEASE ########################################################
+
 2017-01-10 Thore B�ckelmann <tboeckel@gmx.de>
 
   * codesets.c: treat CS_MIBENUM_UTF_16LE/BE and allow CS_MIBENUM_UTF_32LE/BE as
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 #
 # codesets.library - Amiga shared library for handling different codesets
 # Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
-# Copyright (C) 2005-2017 codesets.library Open Source Team
+# Copyright (C) 2005-2018 codesets.library Open Source Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/README.md b/README.md
@@ -107,7 +107,7 @@ To report bugs use the [bug/issue tracker](https://github.com/jens-maus/libcodes
 
 codesets.library was originally written in 2001 and is Copyright (C) 2001-2005 by Alfonso Ranieri.
 As of 2005 the library is maintained by an independent open source team and
-Copyright (C) 2005-2017 codesets.library Open Source Team.
+Copyright (C) 2005-2018 codesets.library Open Source Team.
 
 codesets.library is distributed and licensed under the GNU Lesser General Public License Version 2.1.
 See [COPYING](COPYING) for more detailed information.
diff --git a/developer/examples/Convert.c b/developer/examples/Convert.c
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/developer/examples/DetectCodeset.c b/developer/examples/DetectCodeset.c
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/developer/examples/Makefile b/developer/examples/Makefile
@@ -2,7 +2,7 @@
 #
 # codesets.library - Amiga shared library for handling different codesets
 # Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
-# Copyright (C) 2005-2017 codesets.library Open Source Team
+# Copyright (C) 2005-2018 codesets.library Open Source Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -207,9 +207,9 @@ ifeq ($(OS), os3)
   endif
 
   # Compiler/Linker flags
-  CPU	    = -m68020-60 -msoft-float
-  CFLAGS  += -noixemul
-  LDFLAGS += -noixemul
+  CPU	    = -m68020-60 -msoft-float -D__amigaos3__
+  CFLAGS  += -mcrt=clib2
+  LDFLAGS += -mcrt=clib2
   LDLIBS  += -ldebug -lmui
   NOINLINE = -DNO_INLINE_STDARG
 
diff --git a/developer/examples/UTF8ToStrHook.c b/developer/examples/UTF8ToStrHook.c
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/developer/examples/b64d.c b/developer/examples/b64d.c
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/developer/examples/b64e.c b/developer/examples/b64e.c
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/developer/examples/demo1.c b/developer/examples/demo1.c
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -80,7 +80,7 @@ long __stack = 8192;
 
 struct Library *MUIMasterBase = NULL;
 struct Library *CodesetsBase = NULL;
-#ifdef __AROS__
+#if defined(__AROS__) || defined(__amigaos3__)
 struct UtilityBase *UtilityBase = NULL;
 #else
 struct Library *UtilityBase = NULL;
@@ -801,7 +801,7 @@ main(UNUSED int argc,char **argv)
                GETINTERFACE(IMUIMaster, MUIMasterBase))
             {
                 /* Create classes */
-		if ((appClass = MUI_CreateCustomClass(NULL, 		MUIC_Application, NULL, sizeof(struct appData), ENTRY(appDispatcher))) &&
+		if ((appClass = MUI_CreateCustomClass(NULL, MUIC_Application, NULL, sizeof(struct appData), ENTRY(appDispatcher))) &&
 		    (popupCodesetsClass = MUI_CreateCustomClass(NULL, MUIC_Popobject, NULL, 0, ENTRY(popupDispatcher))) &&
 		    (editorClass = MUI_CreateCustomClass(NULL, MUIC_TextEditor, NULL, sizeof(struct editorData), ENTRY(editorDispatcher))))
                 {
diff --git a/developer/examples/vastubs.c b/developer/examples/vastubs.c
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/developer/include/clib/codesets_protos.h b/developer/include/clib/codesets_protos.h
@@ -5,7 +5,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/developer/include/inline/codesets.h b/developer/include/inline/codesets.h
@@ -5,7 +5,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/developer/include/libraries/codesets.h b/developer/include/libraries/codesets.h
@@ -5,7 +5,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/developer/include/ppcinline/codesets.h b/developer/include/ppcinline/codesets.h
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/developer/include/pragmas/codesets_pragmas.h b/developer/include/pragmas/codesets_pragmas.h
@@ -5,7 +5,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/developer/include/proto/codesets.h b/developer/include/proto/codesets.h
@@ -5,7 +5,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/dist/codesets/ReadMe b/dist/codesets/ReadMe
@@ -2,8 +2,8 @@ Short:    Library handling codesets and character conversions
 Author:   codesets.library Open Source Team
 Uploader: Jens Maus <mail@jens-maus.de>
 Type:     util/libs
-Version:  6.20
-Replaces: util/libs/codesets-6.19.lha
+Version:  6.21
+Replaces: util/libs/codesets-6.20.lha
 Requires: AmigaOS 3.0+, MorphOS or AROS
 Architecture: ppc-amigaos >= 4.0.0; m68k-amigaos >= 3.0; ppc-morphos >= 1.4.2; i386-aros; ppc-aros; x86_64-aros
 
@@ -69,10 +69,10 @@ The library is available for AmigaOS3 (m68k), AmigaOS4 (PPC), MorphOS (PPC)
 or for AROS.
 
 It is an open-source development effort of many people and is
-kindly hosted on SourceForge. The project name is "codesetslib" and the
+kindly hosted on Github. The project name is "libcodesets" and the
 project's page can be found at:
 
-http://sf.net/p/codesetslib/
+https://github.com/jens-maus/libcodesets
 
 Please use this address for further updates, bug reports and feature
 requests and try to avoid direct mail contact to single developers. We really
diff --git a/include/clib/codesets_protos.h b/include/clib/codesets_protos.h
@@ -5,7 +5,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/include/inline/codesets.h b/include/inline/codesets.h
@@ -5,7 +5,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/include/libraries/codesets.h b/include/libraries/codesets.h
@@ -5,7 +5,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/include/ppcinline/codesets.h b/include/ppcinline/codesets.h
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/include/pragmas/codesets_pragmas.h b/include/pragmas/codesets_pragmas.h
@@ -5,7 +5,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/include/proto/codesets.h b/include/proto/codesets.h
@@ -5,7 +5,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/libcodesets/Makefile b/libcodesets/Makefile
@@ -2,7 +2,7 @@
 #
 # codesets.library - Amiga shared library for handling different codesets
 # Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
-# Copyright (C) 2005-2017 codesets.library Open Source Team
+# Copyright (C) 2005-2018 codesets.library Open Source Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/Makefile b/src/Makefile
@@ -2,7 +2,7 @@
 #
 # codesets.library - Amiga shared library for handling different codesets
 # Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
-# Copyright (C) 2005-2017 codesets.library Open Source Team
+# Copyright (C) 2005-2018 codesets.library Open Source Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
diff --git a/src/base.h b/src/base.h
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/src/base64.c b/src/base64.c
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/src/codepages.c b/src/codepages.c
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/src/codepages.h b/src/codepages.h
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/src/codesets.c b/src/codesets.c
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/src/codesets_table.h b/src/codesets_table.h
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/src/debug.c b/src/debug.c
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/src/debug.h b/src/debug.h
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/src/init.c b/src/init.c
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/src/lib.h b/src/lib.h
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/src/lib_protos.h b/src/lib_protos.h
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/src/libinit.c b/src/libinit.c
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/src/macros.h b/src/macros.h
@@ -2,7 +2,7 @@
 
  codesets.library - Amiga shared library for handling different codesets
  Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.
- Copyright (C) 2005-2017 codesets.library Open Source Team
+ Copyright (C) 2005-2018 codesets.library Open Source Team
 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/src/stubs-aros.c b/src/stubs-aros.c
diff --git a/src/stubs-morphos.c b/src/stubs-morphos.c
diff --git a/src/utils.c b/src/utils.c
diff --git a/src/version.h b/src/version.h

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# codesets.library - Amiga shared library for handling different codesets`
`4`	`4`	`# Copyright (C) 2001-2005 by Alfonso [alfie] Ranieri <alforan@tin.it>.`
`5`		`-# Copyright (C) 2005-2017 codesets.library Open Source Team`
	`5`	`+# Copyright (C) 2005-2018 codesets.library Open Source Team`
`6`	`6`	`#`
`7`	`7`	`# This library is free software; you can redistribute it and/or`
`8`	`8`	`# modify it under the terms of the GNU Lesser General Public`