Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/jens-maus/libcodesets
Browse files Browse the repository at this point in the history
  • Loading branch information
@tboeckel
tboeckel committed Jan 16, 2018
2 parents e6efdee + 268fbcf commit 1dd4e39
Show file tree
Hide file tree
Showing 43 changed files with 55 additions and 53 deletions.
2 changes: 2 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion developer/examples/Convert.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion developer/examples/DetectCodeset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions developer/examples/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion developer/examples/UTF8ToStrHook.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion developer/examples/b64d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion developer/examples/b64e.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions developer/examples/demo1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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))))
{
Expand Down
2 changes: 1 addition & 1 deletion developer/examples/vastubs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion developer/include/clib/codesets_protos.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion developer/include/inline/codesets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion developer/include/libraries/codesets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion developer/include/ppcinline/codesets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion developer/include/pragmas/codesets_pragmas.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion developer/include/proto/codesets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions dist/codesets/ReadMe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/clib/codesets_protos.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/inline/codesets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/libraries/codesets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/ppcinline/codesets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/pragmas/codesets_pragmas.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/proto/codesets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libcodesets/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/base64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/codepages.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/codepages.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/codesets.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/codesets_table.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/debug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/debug.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/lib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/lib_protos.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/libinit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/macros.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 1dd4e39

Please sign in to comment.