Integrated oggvorbis into build, cleanedup ldap, mad and openal

git-svn-id: trunk@4664 -

packages/extra/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/09/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/09/20]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
@@ -231,13 +231,13 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad unixutil
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad oggvorbis unixutil
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 override TARGET_DIRS+=unzip
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_DIRS+=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk winunits fftw md4 mad openal
+override TARGET_DIRS+=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk winunits fftw md4 mad openal oggvorbis
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 override TARGET_DIRS+=os2units rexx unzip zlib x11 gtk libpng tcl imlib fpgtk
@@ -270,7 +270,7 @@ ifeq ($(FULL_TARGET),i386-wince)
 override TARGET_DIRS+=unzip zlib tcl fftw
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad oggvorbis
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 md4
@@ -288,7 +288,7 @@ ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_DIRS+=palmunits
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad oggvorbis
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 md4
@@ -300,7 +300,7 @@ ifeq ($(FULL_TARGET),powerpc-darwin)
 override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 univint
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad oggvorbis
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 md4
@@ -309,7 +309,7 @@ ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad oggvorbis
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 md4
@@ -318,7 +318,7 @@ ifeq ($(FULL_TARGET),x86_64-win64)
 override TARGET_DIRS+=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk winunits fftw md4
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad oggvorbis
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_DIRS+=palmunits
@@ -327,7 +327,7 @@ ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_DIRS+=unzip zlib tcl fftw
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad
+override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses tcl cdrom imlib gnome1 fpgtk newt uuid md4 ldap openal mad oggvorbis
 endif
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCSUBDIR=packages/extra
@@ -1422,6 +1422,7 @@ TARGET_DIRS_MD4=1
 TARGET_DIRS_LDAP=1
 TARGET_DIRS_OPENAL=1
 TARGET_DIRS_MAD=1
+TARGET_DIRS_OGGVORBIS=1
 TARGET_DIRS_UNIXUTIL=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
@@ -1441,6 +1442,7 @@ TARGET_DIRS_FFTW=1
 TARGET_DIRS_MD4=1
 TARGET_DIRS_MAD=1
 TARGET_DIRS_OPENAL=1
+TARGET_DIRS_OGGVORBIS=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 TARGET_DIRS_OS2UNITS=1
@@ -1624,6 +1626,7 @@ TARGET_DIRS_MD4=1
 TARGET_DIRS_LDAP=1
 TARGET_DIRS_OPENAL=1
 TARGET_DIRS_MAD=1
+TARGET_DIRS_OGGVORBIS=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 TARGET_DIRS_UNZIP=1
@@ -1728,6 +1731,7 @@ TARGET_DIRS_MD4=1
 TARGET_DIRS_LDAP=1
 TARGET_DIRS_OPENAL=1
 TARGET_DIRS_MAD=1
+TARGET_DIRS_OGGVORBIS=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 TARGET_DIRS_UNZIP=1
@@ -1807,6 +1811,7 @@ TARGET_DIRS_MD4=1
 TARGET_DIRS_LDAP=1
 TARGET_DIRS_OPENAL=1
 TARGET_DIRS_MAD=1
+TARGET_DIRS_OGGVORBIS=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_DIRS_UNZIP=1
@@ -1882,6 +1887,7 @@ TARGET_DIRS_MD4=1
 TARGET_DIRS_LDAP=1
 TARGET_DIRS_OPENAL=1
 TARGET_DIRS_MAD=1
+TARGET_DIRS_OGGVORBIS=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 TARGET_DIRS_UNZIP=1
@@ -1949,6 +1955,7 @@ TARGET_DIRS_MD4=1
 TARGET_DIRS_LDAP=1
 TARGET_DIRS_OPENAL=1
 TARGET_DIRS_MAD=1
+TARGET_DIRS_OGGVORBIS=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 TARGET_DIRS_PALMUNITS=1
@@ -1988,6 +1995,7 @@ TARGET_DIRS_MD4=1
 TARGET_DIRS_LDAP=1
 TARGET_DIRS_OPENAL=1
 TARGET_DIRS_MAD=1
+TARGET_DIRS_OGGVORBIS=1
 endif
 ifdef TARGET_DIRS_UNZIP
 unzip_all:
@@ -3249,6 +3257,51 @@ mad:
 	$(MAKE) -C mad all
 .PHONY: mad_all mad_debug mad_smart mad_release mad_units mad_examples mad_shared mad_install mad_sourceinstall mad_exampleinstall mad_distinstall mad_zipinstall mad_zipsourceinstall mad_zipexampleinstall mad_zipdistinstall mad_clean mad_distclean mad_cleanall mad_info mad_makefiles mad
 endif
+ifdef TARGET_DIRS_OGGVORBIS
+oggvorbis_all:
+	$(MAKE) -C oggvorbis all
+oggvorbis_debug:
+	$(MAKE) -C oggvorbis debug
+oggvorbis_smart:
+	$(MAKE) -C oggvorbis smart
+oggvorbis_release:
+	$(MAKE) -C oggvorbis release
+oggvorbis_units:
+	$(MAKE) -C oggvorbis units
+oggvorbis_examples:
+	$(MAKE) -C oggvorbis examples
+oggvorbis_shared:
+	$(MAKE) -C oggvorbis shared
+oggvorbis_install:
+	$(MAKE) -C oggvorbis install
+oggvorbis_sourceinstall:
+	$(MAKE) -C oggvorbis sourceinstall
+oggvorbis_exampleinstall:
+	$(MAKE) -C oggvorbis exampleinstall
+oggvorbis_distinstall:
+	$(MAKE) -C oggvorbis distinstall
+oggvorbis_zipinstall:
+	$(MAKE) -C oggvorbis zipinstall
+oggvorbis_zipsourceinstall:
+	$(MAKE) -C oggvorbis zipsourceinstall
+oggvorbis_zipexampleinstall:
+	$(MAKE) -C oggvorbis zipexampleinstall
+oggvorbis_zipdistinstall:
+	$(MAKE) -C oggvorbis zipdistinstall
+oggvorbis_clean:
+	$(MAKE) -C oggvorbis clean
+oggvorbis_distclean:
+	$(MAKE) -C oggvorbis distclean
+oggvorbis_cleanall:
+	$(MAKE) -C oggvorbis cleanall
+oggvorbis_info:
+	$(MAKE) -C oggvorbis info
+oggvorbis_makefiles:
+	$(MAKE) -C oggvorbis makefiles
+oggvorbis:
+	$(MAKE) -C oggvorbis all
+.PHONY: oggvorbis_all oggvorbis_debug oggvorbis_smart oggvorbis_release oggvorbis_units oggvorbis_examples oggvorbis_shared oggvorbis_install oggvorbis_sourceinstall oggvorbis_exampleinstall oggvorbis_distinstall oggvorbis_zipinstall oggvorbis_zipsourceinstall oggvorbis_zipexampleinstall oggvorbis_zipdistinstall oggvorbis_clean oggvorbis_distclean oggvorbis_cleanall oggvorbis_info oggvorbis_makefiles oggvorbis
+endif
 ifdef TARGET_DIRS_UNIXUTIL
 unixutil_all:
 	$(MAKE) -C unixutil all

packages/extra/Makefile.fpc

@@ -7,7 +7,7 @@ dirs_linux=unzip zlib fftw \
            forms svgalib ggi libpng libgd \
            utmp bfd gdbm ncurses tcl cdrom \
            imlib gnome1 fpgtk newt uuid \
-           md4 ldap openal mad
+           md4 ldap openal mad oggvorbis
 dirs_i386_linux=unixutil
 dirs_netbsd=unzip zlib \
             x11 opengl gtk syslog \
@@ -24,7 +24,7 @@ dirs_openbsd=unzip zlib \
              forms svgalib ggi libpng libgd \
              utmp bfd gdbm ncurses fpgtk \
              tcl imlib gnome1 md4
-dirs_win32=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk winunits fftw md4 mad openal
+dirs_win32=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk winunits fftw md4 mad openal oggvorbis
 dirs_win64=unzip opengl gtk gtk2 zlib tcl cdrom fpgtk winunits fftw md4
 dirs_wince=unzip zlib tcl fftw
 dirs_os2=os2units \

packages/extra/ldap/lber.pas

@@ -43,12 +43,12 @@ begin
     LBER_SBIOD_CTRL_NEXT := 0;
 end;
 
-function ber_bvstr(const str: PChar): PBerval;
+function ber_bvstr(const str: pcchar): PBerval;
 begin
   ber_bvstr := ber_str2bv(str, 0, false, nil);
 end;
 
-function ber_bvstrdup(const str: PChar): PBerval;
+function ber_bvstrdup(const str: pcchar): PBerval;
 begin
   ber_bvstrdup := ber_str2bv(str, 0, true, nil);
 end;

packages/extra/ldap/lber_typesh.inc

@@ -22,7 +22,8 @@ uses
   ctypes;
 
 type
-  PPPChar                           = ^PPChar;
+  ppcchar                           = ^pcchar;
+  pppcchar                          = ^ppcchar;
 
 (* LBER Boolean, enum, integers (32 bits or larger) *)
   LBER_INT_T                        = cint;

packages/extra/ldap/lberh.inc

@@ -106,7 +106,7 @@ const
 type
   BER_ERRNO_FN                      = function: pcint; cdecl;
 
-  BER_LOG_PRINT_FN                  = procedure(const buf: PChar); cdecl;
+  BER_LOG_PRINT_FN                  = procedure(const buf: pcchar); cdecl;
 
   BER_MEMALLOC_FN                   = function(size: ber_len_t): Pointer; cdecl;
   BER_MEMCALLOC_FN                  = function(n: ber_len_t; size: ber_len_t): Pointer; cdecl;
@@ -159,7 +159,7 @@ const
   LBER_OPT_OFF                      = Pointer(0);
 
 var
-  ber_pvt_opt_on: char; cvar; external;
+  ber_pvt_opt_on: cchar; cvar; external;
 
 function LBER_OPT_ON: Pointer;
 
@@ -207,7 +207,7 @@ type
   PBerval                           = ^Berval;
   Berval                            = record
     bv_len  : ber_len_t;
-    bv_val  : PChar;
+    bv_val  : pcchar;
   end;
   
   PBerVarray                        = ^BerVarray;
@@ -219,9 +219,9 @@ type
 (*
  * in bprint.c:
  *)
-procedure ber_error_print(const data: PChar); cdecl; external;
+procedure ber_error_print(const data: pcchar); cdecl; external;
 
-procedure ber_bprint(const data: PChar; len: ber_len_t); cdecl; external;
+procedure ber_bprint(const data: pcchar; len: ber_len_t); cdecl; external;
 
 procedure ber_dump(ber: PBerElement; inout : cint); cdecl; external;
 
@@ -245,25 +245,25 @@ function ber_get_int(ber: PBerElement; var num: ber_int_t): ber_tag_t; cdecl; ex
 
 function ber_get_enum(ber: PBerElement; var num: ber_int_t): ber_tag_t; cdecl; external;
 
-function ber_get_stringb(ber: PBerElement; buf: PChar; var len: ber_len_t): ber_tag_t; cdecl; external;
+function ber_get_stringb(ber: PBerElement; buf: pcchar; var len: ber_len_t): ber_tag_t; cdecl; external;
 
 function ber_get_stringbv(ber: PBerElement; bv: PBerval; alloc: cbool): ber_tag_t; cdecl; external;
 
-function ber_get_stringa(ber: PBerElement; var buf: PChar): ber_tag_t; cdecl; external;
+function ber_get_stringa(ber: PBerElement; var buf: pcchar): ber_tag_t; cdecl; external;
 
 function ber_get_stringal(ber: PBerElement; var bv: PBerval): ber_tag_t; cdecl; external;
 
-function ber_get_bitstringa(ber: PBerElement; var buf: PChar; var len: ber_len_t): ber_tag_t; cdecl; external;
+function ber_get_bitstringa(ber: PBerElement; var buf: pcchar; var len: ber_len_t): ber_tag_t; cdecl; external;
 
 function ber_get_null(ber: PBerElement): ber_tag_t; cdecl; external;
 
 function ber_get_Boolean(ber: PBerElement; var boolval: ber_int_t): ber_tag_t; cdecl; external;
 
-function ber_first_element(ber: PBerElement; var len: ber_len_t; var last: PChar): ber_tag_t; cdecl; external;
+function ber_first_element(ber: PBerElement; var len: ber_len_t; var last: pcchar): ber_tag_t; cdecl; external;
 
-function ber_next_element(ber: PBerElement; var len: ber_len_t; const last: PChar): ber_tag_t; cdecl; external;
+function ber_next_element(ber: PBerElement; var len: ber_len_t; const last: pcchar): ber_tag_t; cdecl; external;
 
-function ber_scanf(ber: PBerElement;const fmt: PChar): ber_tag_t; cdecl; varargs; external;
+function ber_scanf(ber: PBerElement;const fmt: pcchar): ber_tag_t; cdecl; varargs; external;
 
 
 (*
@@ -277,13 +277,13 @@ function ber_put_enum(ber: PBerElement; num: ber_int_t; tag: ber_tag_t): cint; c
 
 function ber_put_int(ber: PBerElement; num: ber_int_t; tag: ber_tag_t): cint; cdecl; external;
 
-function ber_put_ostring(ber: PBerElement; const str: PChar; len: ber_len_t; tag: ber_tag_t): cint; cdecl; external;
+function ber_put_ostring(ber: PBerElement; const str: pcchar; len: ber_len_t; tag: ber_tag_t): cint; cdecl; external;
 
 function ber_put_berval(ber: PBerElement; bv: PBerval; tag: ber_tag_t): cint; cdecl; external;
 
-function ber_put_string(ber: PBerElement; const str: PChar; tag: ber_tag_t): cint; cdecl; external;
+function ber_put_string(ber: PBerElement; const str: pcchar; tag: ber_tag_t): cint; cdecl; external;
 
-function ber_put_bitstring(ber: PBerElement; const str: PChar; bitlen: ber_len_t; tag: ber_tag_t): cint; cdecl; external;
+function ber_put_bitstring(ber: PBerElement; const str: pcchar; bitlen: ber_len_t; tag: ber_tag_t): cint; cdecl; external;
 
 function ber_put_null(ber: PBerElement; tag: ber_tag_t): cint; cdecl; external;
 
@@ -297,16 +297,16 @@ function ber_put_seq(ber: PBerElement): cint; cdecl; external;
 
 function ber_put_set(ber: PBerElement): cint; cdecl; external;
 
-function ber_printf(ber: PBerElement; const fmt: PChar): cint; cdecl; varargs; external;
+function ber_printf(ber: PBerElement; const fmt: pcchar): cint; cdecl; varargs; external;
 
 
 (*
  * in io.c:
  *)
 
-function ber_read(ber: PBerElement; buf: PChar; len: ber_len_t): ber_slen_t; cdecl; external;
+function ber_read(ber: PBerElement; buf: pcchar; len: ber_len_t): ber_slen_t; cdecl; external;
 
-function ber_write(ber: PBerElement; const buf: PChar; len: ber_len_t; nosos: cint): ber_slen_t; cdecl; external;
+function ber_write(ber: PBerElement; const buf: pcchar; len: ber_len_t; nosos: cint): ber_slen_t; cdecl; external;
 
 procedure ber_free(ber: PBerElement; freebuf: cbool); cdecl; external;
 
@@ -396,15 +396,15 @@ function ber_dupbv(dst: PBerval; src: PBerval): PBerval; cdecl; external;
 
 function ber_bvdup(src: PBerval): PBerval; cdecl; external;
 
-function ber_str2bv(const str: PChar; len: ber_len_t; duplicate: cbool; bv: PBerval): PBerval; cdecl; external;
+function ber_str2bv(const str: pcchar; len: ber_len_t; duplicate: cbool; bv: PBerval): PBerval; cdecl; external;
 
-function ber_mem2bv(const str: PChar; len: ber_len_t; duplicate: cbool; bv: PBerval): PBerval; cdecl; external;
+function ber_mem2bv(const str: pcchar; len: ber_len_t; duplicate: cbool; bv: PBerval): PBerval; cdecl; external;
 
-function ber_bvstr(const str: PChar): PBerval;
+function ber_bvstr(const str: pcchar): PBerval;
 
-function ber_bvstrdup(const str: PChar): PBerval;
+function ber_bvstrdup(const str: pcchar): PBerval;
 
-function ber_strdup(const str: PChar): PChar; cdecl; external;
+function ber_strdup(const str: pcchar): pcchar; cdecl; external;
 
 procedure ber_bvarray_free(p: BerVarray); cdecl; external;
 

packages/extra/ldap/ldap_schemah.inc

@@ -38,8 +38,8 @@ const
 type
   pldap_schema_extension_item       = ^ldap_schema_extension_item;
   ldap_schema_extension_item        = record
-    lsei_name   : PChar;
-    lsei_values : PPChar;
+    lsei_name   : pcchar;
+    lsei_values : ppcchar;
   end;
 
   PPLDAPSchemaExtensionItem         = ^PLDAPSchemaExtensionItem;
@@ -48,9 +48,9 @@ type
 
   pldap_syntax                      = ^ldap_syntax;
   ldap_syntax                       = record
-    syn_oid         : PChar;        (* REQUIRED *)
-    syn_names       : PPChar;       (* OPTIONAL *)
-    syn_desc        : PChar;        (* OPTIONAL *)
+    syn_oid         : pcchar;        (* REQUIRED *)
+    syn_names       : ppcchar;       (* OPTIONAL *)
+    syn_desc        : pcchar;        (* OPTIONAL *)
     syn_extensions  : PPLDAPSchemaExtensionItem; (* OPTIONAL *)
   end;
 
@@ -59,11 +59,11 @@ type
 
   pldap_matchingrule                = ^ldap_matchingrule;
   ldap_matchingrule                 = record
-    mr_oid          : PChar;        (* REQUIRED *)
-    mr_names        : PPChar;       (* OPTIONAL *)
-    mr_desc         : PChar;        (* OPTIONAL *)
+    mr_oid          : pcchar;        (* REQUIRED *)
+    mr_names        : ppcchar;       (* OPTIONAL *)
+    mr_desc         : pcchar;        (* OPTIONAL *)
     mr_obsolete     : cint;         (* OPTIONAL *)
-    mr_syntax_oid   : PChar;        (* REQUIRED *)
+    mr_syntax_oid   : pcchar;        (* REQUIRED *)
     mr_extensions   : PPLDAPSchemaExtensionItem; (* OPTIONAL *)
   end;
 
@@ -72,11 +72,11 @@ type
 
   pldap_matchingruleuse             = ^ldap_matchingruleuse;
   ldap_matchingruleuse              = record
-    mru_oid         : PChar;        (* REQUIRED *)
-    mru_names       : PPChar;       (* OPTIONAL *)
-    mru_desc        : PChar;        (* OPTIONAL *)
+    mru_oid         : pcchar;        (* REQUIRED *)
+    mru_names       : ppcchar;       (* OPTIONAL *)
+    mru_desc        : pcchar;        (* OPTIONAL *)
     mru_obsolete    : cint;         (* OPTIONAL *)
-    mru_applies_oids: PPChar;       (* REQUIRED *)
+    mru_applies_oids: ppcchar;       (* REQUIRED *)
     mru_extensions  : PPLDAPSchemaExtensionItem; (* OPTIONAL *)
   end;
 
@@ -85,15 +85,15 @@ type
 
   pldap_attributetype               = ^ldap_attributetype;
   ldap_attributetype                = record
-    at_oid          : PChar;        (* REQUIRED *)
-    at_names        : PPChar;       (* OPTIONAL *)
-    at_desc         : PChar;        (* OPTIONAL *)
+    at_oid          : pcchar;        (* REQUIRED *)
+    at_names        : ppcchar;       (* OPTIONAL *)
+    at_desc         : pcchar;        (* OPTIONAL *)
     at_obsolete     : cint;         (* 0=no, 1=yes *)
-    at_sup_oid      : PChar;        (* OPTIONAL *)
-    at_equality_oid : PChar;        (* OPTIONAL *)
-    at_ordering_oid : PChar;        (* OPTIONAL *)
-    at_substr_oid   : PChar;        (* OPTIONAL *)
-    at_syntax_oid   : PChar;        (* OPTIONAL *)
+    at_sup_oid      : pcchar;        (* OPTIONAL *)
+    at_equality_oid : pcchar;        (* OPTIONAL *)
+    at_ordering_oid : pcchar;        (* OPTIONAL *)
+    at_substr_oid   : pcchar;        (* OPTIONAL *)
+    at_syntax_oid   : pcchar;        (* OPTIONAL *)
     at_syntax_len   : cint;         (* OPTIONAL *)
     at_single_value : cint;         (* 0=no, 1=yes *)
     at_collective   : cint;         (* 0=no, 1=yes *)
@@ -107,14 +107,14 @@ type
 
   pldap_objectclass                 = ^ldap_objectclass;
   ldap_objectclass                  = record
-    oc_oid          : PChar;        (* REQUIRED *)
-    oc_names        : PPChar;       (* OPTIONAL *)
-    oc_desc         : PChar;        (* OPTIONAL *)
+    oc_oid          : pcchar;        (* REQUIRED *)
+    oc_names        : ppcchar;       (* OPTIONAL *)
+    oc_desc         : pcchar;        (* OPTIONAL *)
     oc_obsolete     : cint;         (* 0=no, 1=yes *)
-    oc_sup_oids     : PPChar;       (* OPTIONAL *)
+    oc_sup_oids     : ppcchar;       (* OPTIONAL *)
     oc_kind         : cint;         (* 0=ABSTRACT, 1=STRUCTURAL, 2=AUXILIARY *)
-    oc_at_oids_must : PPChar;       (* OPTIONAL *)
-    oc_at_oids_may  : PPChar;       (* OPTIONAL *)
+    oc_at_oids_must : ppcchar;       (* OPTIONAL *)
+    oc_at_oids_may  : ppcchar;       (* OPTIONAL *)
     oc_extensions   : PPLDAPSchemaExtensionItem; (* OPTIONAL *)
   end;
 
@@ -123,15 +123,15 @@ type
 
   pldap_contentrule                 = ^ldap_contentrule;
   ldap_contentrule                  = record
-    cr_oid          : PChar;        (* REQUIRED *)
-    cr_names        : PPChar;       (* OPTIONAL *)
-    cr_desc         : PChar;        (* OPTIONAL *)
-    cr_sup_oids     : PPChar;       (* OPTIONAL *)
+    cr_oid          : pcchar;        (* REQUIRED *)
+    cr_names        : ppcchar;       (* OPTIONAL *)
+    cr_desc         : pcchar;        (* OPTIONAL *)
+    cr_sup_oids     : ppcchar;       (* OPTIONAL *)
     cr_obsolete     : cint;         (* 0=no, 1=yes *)
-    cr_oc_oids_aux  : PPChar;       (* OPTIONAL *)
-    cr_at_oids_must : PPChar;       (* OPTIONAL *)
-    cr_at_oids_may  : PPChar;       (* OPTIONAL *)
-    cr_at_oids_not  : PPChar;       (* OPTIONAL *)
+    cr_oc_oids_aux  : ppcchar;       (* OPTIONAL *)
+    cr_at_oids_must : ppcchar;       (* OPTIONAL *)
+    cr_at_oids_may  : ppcchar;       (* OPTIONAL *)
+    cr_at_oids_not  : ppcchar;       (* OPTIONAL *)
     cr_extensions   : PPLDAPSchemaExtensionItem; (* OPTIONAL *)
   end;
 
@@ -140,13 +140,13 @@ type
 
   pldap_nameform                    = ^ldap_nameform;
   ldap_nameform                     = record
-    nf_oid          : PChar;        (* REQUIRED *)
-    nf_names        : PPChar;       (* OPTIONAL *)
-    nf_desc         : PChar;        (* OPTIONAL *)
+    nf_oid          : pcchar;        (* REQUIRED *)
+    nf_names        : ppcchar;       (* OPTIONAL *)
+    nf_desc         : pcchar;        (* OPTIONAL *)
     nf_obsolete     : cint;         (* 0=no, 1=yes *)
-    nf_objectclass  : PChar;        (* REQUIRED *)
-    nf_at_oids_must : PPChar;       (* REQUIRED *)
-    nf_at_oids_may  : PPChar;       (* OPTIONAL *)
+    nf_objectclass  : pcchar;        (* REQUIRED *)
+    nf_at_oids_must : ppcchar;       (* REQUIRED *)
+    nf_at_oids_may  : ppcchar;       (* OPTIONAL *)
     nf_extensions   : PPLDAPSchemaExtensionItem; (* OPTIONAL *)
   end;
 
@@ -156,10 +156,10 @@ type
   pldap_structurerule               = ^ldap_structurerule;
   ldap_structurerule                = record
     sr_ruleid       : cint;          (* REQUIRED *)
-    sr_names        : PPChar;        (* OPTIONAL *)
-    sr_desc         : PChar;         (* OPTIONAL *)
+    sr_names        : ppcchar;        (* OPTIONAL *)
+    sr_desc         : pcchar;         (* OPTIONAL *)
     sr_obsolete     : cint;          (* 0=no, 1=yes *)
-    sr_nameform     : PChar;         (* REQUIRED *)
+    sr_nameform     : pcchar;         (* REQUIRED *)
     sr_nsup_ruleids : cint;          (* number of sr_sup_ruleids *)
     sr_sup_ruleids  : pcint;         (* OPTIONAL *)
     sr_extensions   : PPLDAPSchemaExtensionItem; (* OPTIONAL *)
@@ -201,14 +201,14 @@ const
   LDAP_SCHEMA_SKIP                  = $80;      (* Don't malloc any result      *)
 
 
-function ldap_syntax2name(syn: PLDAPSyntax): PChar; cdecl; external;
-function ldap_matchingrule2name(mr: PLDAPMatchingRule): PChar; cdecl; external;
-function ldap_matchingruleuse2name(mru: PLDAPMatchingRuleUse): PChar; cdecl; external;
-function ldap_attributetype2name(_at: PLDAPAttributeType): PChar; cdecl; external;
-function ldap_objectclass2name(oc: PLDAPObjectClass): PChar; cdecl; external;
-function ldap_contentrule2name(cr: PLDAPContentRule): PChar; cdecl; external;
-function ldap_nameform2name(nf: PLDAPNameForm): PChar; cdecl; external;
-function ldap_structurerule2name(sr: PLDAPStructureRule): PChar; cdecl; external;
+function ldap_syntax2name(syn: PLDAPSyntax): pcchar; cdecl; external;
+function ldap_matchingrule2name(mr: PLDAPMatchingRule): pcchar; cdecl; external;
+function ldap_matchingruleuse2name(mru: PLDAPMatchingRuleUse): pcchar; cdecl; external;
+function ldap_attributetype2name(_at: PLDAPAttributeType): pcchar; cdecl; external;
+function ldap_objectclass2name(oc: PLDAPObjectClass): pcchar; cdecl; external;
+function ldap_contentrule2name(cr: PLDAPContentRule): pcchar; cdecl; external;
+function ldap_nameform2name(nf: PLDAPNameForm): pcchar; cdecl; external;
+function ldap_structurerule2name(sr: PLDAPStructureRule): pcchar; cdecl; external;
 
 procedure ldap_syntax_free(syn: PLDAPSyntax); cdecl; external;
 procedure ldap_matchingrule_free(mr: PLDAPMatchingRule); cdecl; external;
@@ -219,37 +219,37 @@ procedure ldap_contentrule_free(cr: PLDAPContentRule); cdecl; external;
 procedure ldap_nameform_free(nf: PLDAPNameForm); cdecl; external;
 procedure ldap_structurerule_free(sr: PLDAPStructureRule); cdecl; external;
 
-function ldap_str2structurerule(const s: PChar; code: pcint; const errp: PPChar; flags: cuint): PLDAPStructureRule; cdecl; external;
-function ldap_str2nameform(const s: PChar; code: pcint; const errp: PPChar; flags: cuint): PLDAPNameForm; cdecl; external;
-function ldap_str2contentrule(const s: PChar; code: pcint; const errp: PPChar; flags: cuint): PLDAPContentRule; cdecl; external;
-function ldap_str2objectclass(const s: PChar; code: pcint; const errp: PPChar; flags: cuint): PLDAPObjectClass; cdecl; external;
-function ldap_str2attributetype(const s: PChar; code: pcint; const errp: PPChar; flags: cuint): PLDAPAttributeType; cdecl; external;
-function ldap_str2syntax(const s: PChar; code: pcint; const errp: PPChar; flags: cuint): PLDAPSyntax; cdecl; external;
-function ldap_str2matchingrule(const s: PChar; code: pcint; const errp: PPChar; flags: cuint): PLDAPMatchingRule; cdecl; external;
-function ldap_str2matchingruleuse(const s: PChar; code: pcint; const errp: PPChar; flags: cuint): PLDAPMatchingRuleUse; cdecl; external;
+function ldap_str2structurerule(const s: pcchar; code: pcint; const errp: ppcchar; flags: cuint): PLDAPStructureRule; cdecl; external;
+function ldap_str2nameform(const s: pcchar; code: pcint; const errp: ppcchar; flags: cuint): PLDAPNameForm; cdecl; external;
+function ldap_str2contentrule(const s: pcchar; code: pcint; const errp: ppcchar; flags: cuint): PLDAPContentRule; cdecl; external;
+function ldap_str2objectclass(const s: pcchar; code: pcint; const errp: ppcchar; flags: cuint): PLDAPObjectClass; cdecl; external;
+function ldap_str2attributetype(const s: pcchar; code: pcint; const errp: ppcchar; flags: cuint): PLDAPAttributeType; cdecl; external;
+function ldap_str2syntax(const s: pcchar; code: pcint; const errp: ppcchar; flags: cuint): PLDAPSyntax; cdecl; external;
+function ldap_str2matchingrule(const s: pcchar; code: pcint; const errp: ppcchar; flags: cuint): PLDAPMatchingRule; cdecl; external;
+function ldap_str2matchingruleuse(const s: pcchar; code: pcint; const errp: ppcchar; flags: cuint): PLDAPMatchingRuleUse; cdecl; external;
 
-function ldap_structurerule2str(sr: PLDAPStructureRule): PChar; cdecl; external;
+function ldap_structurerule2str(sr: PLDAPStructureRule): pcchar; cdecl; external;
 function ldap_structurerule2bv(sr: PLDAPStructureRule; bv: PBerval): PBerval; cdecl; external;
 
-function ldap_nameform2str(nf: PLDAPNameForm): PChar; cdecl; external;
+function ldap_nameform2str(nf: PLDAPNameForm): pcchar; cdecl; external;
 function ldap_nameform2bv(nf: PLDAPNameForm; bv: PBerval): PBerval; cdecl; external;
 
-function ldap_contentrule2str(cr: PLDAPContentRule): PChar; cdecl; external;
+function ldap_contentrule2str(cr: PLDAPContentRule): pcchar; cdecl; external;
 function ldap_contentrule2bv(cr: PLDAPContentRule; bv: PBerval): PBerval; cdecl; external;
 
-function ldap_objectclass2str(oc: PLDAPObjectClass): PChar; cdecl; external;
+function ldap_objectclass2str(oc: PLDAPObjectClass): pcchar; cdecl; external;
 function ldap_objectclass2bv(oc: PLDAPObjectClass; bv: PBerval): PBerval; cdecl; external;
 
-function ldap_attributetype2str(_at: PLDAPAttributeType): PChar; cdecl; external;
+function ldap_attributetype2str(_at: PLDAPAttributeType): pcchar; cdecl; external;
 function ldap_attributetype2bv(_at: PLDAPAttributeType; bv: PBerval): PBerval; cdecl; external;
 
-function ldap_syntax2str(syn: PLDAPSyntax): PChar; cdecl; external;
+function ldap_syntax2str(syn: PLDAPSyntax): pcchar; cdecl; external;
 function ldap_syntax2bv(syn: PLDAPSyntax; bv: PBerval): PBerval; cdecl; external;
 
-function ldap_matchingrule2str(mr: PLDAPMatchingRule): PChar; cdecl; external;
+function ldap_matchingrule2str(mr: PLDAPMatchingRule): pcchar; cdecl; external;
 function ldap_matchingrule2bv(mr: PLDAPMatchingRule; bv: PBerval): PBerval; cdecl; external;
 
-function ldap_matchingruleuse2str(mru: PLDAPMatchingRuleUse): PChar; cdecl; external;
+function ldap_matchingruleuse2str(mru: PLDAPMatchingRuleUse): pcchar; cdecl; external;
 function ldap_matchingruleuse2bv(mru: PLDAPMatchingRuleUse; bv: PBerval): PBerval; cdecl; external;
 
-function ldap_scherr2str(code: cint): PChar; cdecl; external;
+function ldap_scherr2str(code: cint): pcchar; cdecl; external;

packages/extra/ldap/ldaph.inc

@@ -162,8 +162,8 @@ type
     ldapai_info_version     : cint;      (* version of LDAPAPIInfo (1) *)
     ldapai_api_version      : cint;      (* revision of API supported *)
     ldapai_protocol_version : cint;      (* highest LDAP version supported *)
-    ldapai_extensions       : PPChar;   (* names of API extensions *)
-    ldapai_vendor_name      : PChar;    (* name of supplier *)
+    ldapai_extensions       : ppcchar;   (* names of API extensions *)
+    ldapai_vendor_name      : pcchar;    (* name of supplier *)
     ldapai_vendor_version   : cint;      (* supplier-specific version * 100 *)
   end;
 
@@ -174,7 +174,7 @@ type
   pldap_apifeature_info             = ^ldap_apifeature_info;
   ldap_apifeature_info              = record
     ldapaif_info_version    : cint;      (* version of this struct (1) *)
-    ldapaif_name            : PChar;    (* matches LDAP_API_FEATURE_... less the prefix *)
+    ldapaif_name            : pcchar;    (* matches LDAP_API_FEATURE_... less the prefix *)
     ldapaif_version         : cint;      (* matches the value LDAP_API_FEATURE_... *)
   end;
 
@@ -185,9 +185,9 @@ type
   PPLDAPControl                     = ^PLDAPControl;
   PLDAPControl                      = ^LDAPControl;
   LDAPControl                       = record
-    ldctl_oid               : PChar;
+    ldctl_oid               : pcchar;
     ldctl_value             : berval;
-    ldctl_iscritical        : char;
+    ldctl_iscritical        : cchar;
   end;
 
 const
@@ -354,7 +354,7 @@ const
 
 
 (* sasl methods *)
-  LDAP_SASL_SIMPLE                  = PChar(0);
+  LDAP_SASL_SIMPLE                  = pcchar(0);
   LDAP_SASL_NULL                    = '';
 
 
@@ -553,16 +553,16 @@ type
  * (see ldap/servers/slapd/slap.h)
  *)
 
-    mod_type    : PChar;
+    mod_type    : pcchar;
 
     case cint of
       0: (mod_vals    : record
            case cint of
-             0: (modv_strvals  : PPChar);
+             0: (modv_strvals  : ppcchar);
              1: (modv_bvals    : PPBerval);
          end);
       1: (case cint of
-           0: (mod_values      : PPChar);
+           0: (mod_values      : ppcchar);
            1: (mod_bvalues     : PPBerval));
   end;
 
@@ -595,14 +595,14 @@ type
   pldap_url_desc                    = ^ldap_url_desc;
   ldap_url_desc                     = record
     lud_next        : pldap_url_desc;
-    lud_scheme      : PChar;
-    lud_host        : PChar;
+    lud_scheme      : pcchar;
+    lud_host        : pcchar;
     lud_port        : cint;
-    lud_dn          : PChar;
-    lud_attrs       : PPChar;
+    lud_dn          : pcchar;
+    lud_attrs       : ppcchar;
     lud_scope       : cint;
-    lud_filter      : PChar;
-    lud_exts        : PChar;
+    lud_filter      : pcchar;
+    lud_exts        : pcchar;
     lud_crit_exts   : cint;
   end;
 
@@ -647,7 +647,7 @@ function ldap_set_option(
 
 (* V3 REBIND Function Callback Prototype *)
 type
-  LDAP_REBIND_PROC = function(ld: PLDAP; const url: PChar; request: ber_tag_t; msgid: ber_int_t; params: Pointer): cint; cdecl;
+  LDAP_REBIND_PROC = function(ld: PLDAP; const url: pcchar; request: ber_tag_t; msgid: ber_int_t; params: Pointer): cint; cdecl;
 
 function ldap_set_rebind_proc(
     ld              : PLDAP;
@@ -657,7 +657,7 @@ function ldap_set_rebind_proc(
 
 (* V3 referral selection Function Callback Prototype *)
 type
-  LDAP_NEXTREF_PROC = function(ld: PLDAP; refsp: PPPChar; cntp: pcint; params: Pointer): cint; cdecl;
+  LDAP_NEXTREF_PROC = function(ld: PLDAP; refsp: pppcchar; cntp: pcint; params: Pointer): cint; cdecl;
 
 
 function ldap_set_nextref_proc(
@@ -672,14 +672,14 @@ function ldap_set_nextref_proc(
  *)
 
 function ldap_create_control(
-    const requestOID: PChar;
+    const requestOID: pcchar;
     ber             : PBerElement;
     iscritical      : cint;
     var ctrlp       : PLDAPControl
   ): cint; cdecl; external;
 
 function ldap_find_control(
-    const oid       : PChar;
+    const oid       : pcchar;
     ctrls           : PPLDAPControl
   ): PLDAPControl; cdecl; external;
 
@@ -697,18 +697,18 @@ procedure ldap_controls_free(
  *)
 
 function ldap_domain2dn(
-    const domain    : PChar;
-    var dn          : PChar
+    const domain    : pcchar;
+    var dn          : pcchar
   ): cint; cdecl; external;
 
 function ldap_dn2domain(
-    const dn        : PChar;
-    var domain      : PChar
+    const dn        : pcchar;
+    var domain      : pcchar
   ): cint; cdecl; external;
 
 function ldap_domain2hostlist(
-    const domain    : PChar;
-    var hostlist    : PChar
+    const domain    : pcchar;
+    var hostlist    : pcchar
   ): cint; cdecl; external;
 
 
@@ -718,7 +718,7 @@ function ldap_domain2hostlist(
 
 function ldap_extended_operation(
     ld              : PLDAP;
-    const reqoid    : PChar;
+    const reqoid    : pcchar;
     reqdata         : PBerval;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl;
@@ -727,18 +727,18 @@ function ldap_extended_operation(
 
 function ldap_extended_operation_s(
     ld              : PLDAP;
-    const reqoid    : PChar;
+    const reqoid    : pcchar;
     reqdata         : PBerval;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl;
-    var retoidp     : PChar;
+    var retoidp     : pcchar;
     var retdatap    : PBerval
   ): cint; cdecl; external;
 
 function ldap_parse_extended_result(
     ld              : PLDAP;
     res             : PLDAPMessage;
-    var retoidp     : PChar;
+    var retoidp     : pcchar;
     var retdatap    : PBerval;
     freeit          : cbool
   ): cint; cdecl; external;
@@ -746,7 +746,7 @@ function ldap_parse_extended_result(
 function ldap_parse_intermediate(
     ld              : PLDAP;
     res             : PLDAPMessage;
-    var retoidp     : PChar;
+    var retoidp     : pcchar;
     var retdatap    : PBerval;
     serverctrls     : PPPLDAPControl;
     freeit          : cbool
@@ -761,7 +761,7 @@ function ldap_parse_intermediate(
 LDAP_F( int )
 ldap_grouping_create LDAP_P((
     LDAP            *ld,
-    LDAP_CONST char *grpoid,
+    LDAP_CONST cchar *grpoid,
     struct berval   *grpdata,
     LDAPControl     **serverctrls,
     LDAPControl     **clientctrls,
@@ -770,7 +770,7 @@ ldap_grouping_create LDAP_P((
 LDAP_F( int )
 ldap_grouping_create_s LDAP_P((
     LDAP            *ld,
-    LDAP_CONST char *grpoid,
+    LDAP_CONST cchar *grpoid,
     struct berval   *grpdata,
     LDAPControl     **serverctrls,
     LDAPControl     **clientctrls,
@@ -789,7 +789,7 @@ ldap_parse_grouping_create_result LDAP_P((
 LDAP_F( int )
 ldap_grouping_end LDAP_P((
     LDAP            *ld,
-    LDAP_CONST char *grpoid,
+    LDAP_CONST cchar *grpoid,
     struct berval   *grpdata,
     LDAPControl     **serverctrls,
     LDAPControl     **clientctrls,
@@ -798,7 +798,7 @@ ldap_grouping_end LDAP_P((
 LDAP_F( int )
 ldap_grouping_end_s LDAP_P((
     LDAP            *ld,
-    LDAP_CONST char *grpoid,
+    LDAP_CONST cchar *grpoid,
     struct berval   *grpdata,
     LDAPControl     **serverctrls,
     LDAPControl     **clientctrls,
@@ -815,7 +815,7 @@ ldap_parse_grouping_end_result LDAP_P((
 LDAP_F( int )
 ldap_grouping_action_operation LDAP_P((
     LDAP            *ld,
-    LDAP_CONST char *grpoid,
+    LDAP_CONST cchar *grpoid,
     struct berval   *grpdata,
     LDAPControl     **serverctrls,
     LDAPControl     **clientctrls,
@@ -824,7 +824,7 @@ ldap_grouping_action_operation LDAP_P((
 LDAP_F( int )
 ldap_grouping_action_operation_s LDAP_P((
     LDAP            *ld,
-    LDAP_CONST char *grpoid,
+    LDAP_CONST cchar *grpoid,
     struct berval   *grpdata,
     LDAPControl     **serverctrls,
     LDAPControl     **clientctrls,
@@ -879,7 +879,7 @@ function ldap_abandon_ext(
 
 function ldap_add_ext(
     ld              : PLDAP;
-    const dn        : PChar;
+    const dn        : pcchar;
     attrs           : PPLDAPMod;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl;
@@ -888,7 +888,7 @@ function ldap_add_ext(
 
 function ldap_add_ext_s(
     ld              : PLDAP;
-    const dn        : PChar;
+    const dn        : pcchar;
     attrs           : PPLDAPMod;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl
@@ -901,8 +901,8 @@ function ldap_add_ext_s(
 
 function ldap_sasl_bind(
     ld              : PLDAP;
-    const dn        : PChar;
-    const mechanism : PChar;
+    const dn        : pcchar;
+    const mechanism : pcchar;
     cred            : PBerval;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl;
@@ -911,8 +911,8 @@ function ldap_sasl_bind(
 
 function ldap_sasl_bind_s(
     ld              : PLDAP;
-    const dn        : PChar;
-    const mechanism : PChar;
+    const dn        : pcchar;
+    const mechanism : pcchar;
     cred            : PBerval;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl;
@@ -939,8 +939,8 @@ type
 
 function ldap_sasl_interactive_bind_s(
     ld              : PLDAP;
-    const dn        : PChar;
-    const mechanism : PChar;
+    const dn        : pcchar;
+    const mechanism : pcchar;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl;
     flags           : cuint;
@@ -962,8 +962,8 @@ function ldap_parse_sasl_bind_result(
 
 function ldap_compare_ext(
     ld              : PLDAP;
-    const dn        : PChar;
-    const attr      : PChar;
+    const dn        : pcchar;
+    const attr      : pcchar;
     bvalue          : PBerval;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl;
@@ -972,8 +972,8 @@ function ldap_compare_ext(
 
 function ldap_compare_ext_s(
     ld              : PLDAP;
-    const dn        : PChar;
-    const attr      : PChar;
+    const dn        : pcchar;
+    const attr      : pcchar;
     bvalue          : PBerval;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl
@@ -986,7 +986,7 @@ function ldap_compare_ext_s(
 
 function ldap_delete_ext(
     ld              : PLDAP;
-    const dn        : PChar;
+    const dn        : pcchar;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl;
     var msgidp      : cint
@@ -994,7 +994,7 @@ function ldap_delete_ext(
 
 function ldap_delete_ext_s(
     ld              : PLDAP;
-    const dn        : PChar;
+    const dn        : pcchar;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl
   ): cint; cdecl; external;
@@ -1008,16 +1008,16 @@ function ldap_parse_result(
     ld              : PLDAP;
     res             : PLDAPMessage;
     errcodep        : pcint;
-    matcheddnp      : PPChar;
-    errmsgp         : PPChar;
-    referralsp      : PPPChar;
+    matcheddnp      : ppcchar;
+    errmsgp         : ppcchar;
+    referralsp      : pppcchar;
     serverctrls     : PPPLDAPControl;
     freeit          : cbool
   ): cint; cdecl; external;
 
 function ldap_err2string(
     err             : cint
-  ): PChar; cdecl; external;
+  ): pcchar; cdecl; external;
 
 
 (*
@@ -1026,7 +1026,7 @@ function ldap_err2string(
 
 function ldap_modify_ext(
     ld              : PLDAP;
-    const dn        : PChar;
+    const dn        : pcchar;
     mods            : PPLDAPMod;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl;
@@ -1035,7 +1035,7 @@ function ldap_modify_ext(
 
 function ldap_modify_ext_s(
     ld              : PLDAP;
-    const dn        : PChar;
+    const dn        : pcchar;
     mods            : PPLDAPMod;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl
@@ -1048,9 +1048,9 @@ function ldap_modify_ext_s(
 
 function ldap_rename(
     ld              : PLDAP;
-    const dn        : PChar;
-    const newrdn    : PChar;
-    const newSuperior: PChar;
+    const dn        : pcchar;
+    const newrdn    : pcchar;
+    const newSuperior: pcchar;
     deleteoldrdn    : cbool;
     sctrls          : PPLDAPControl;
     cctrls          : PPPLDAPControl;
@@ -1059,9 +1059,9 @@ function ldap_rename(
 
 function ldap_rename_s(
     ld              : PLDAP;
-    const dn        : PChar;
-    const newrdn    : PChar;
-    const newSuperior: PChar;
+    const dn        : pcchar;
+    const newrdn    : pcchar;
+    const newSuperior: pcchar;
     deleteoldrdn    : cbool;
     sctrls          : PPLDAPControl;
     cctrls          : PPLDAPControl
@@ -1078,7 +1078,7 @@ function ldap_create(
 
 function ldap_initialize(
     var ld          : PLDAP;
-    const url       : PChar
+    const url       : pcchar
   ): cint; cdecl; external;
 
 
@@ -1150,7 +1150,7 @@ function ldap_count_references(
 function ldap_parse_reference(
     ld              : PLDAP;
     ref             : PLDAPMessage;
-    var referralsp  : PPChar;
+    var referralsp  : ppcchar;
     serverctrls     : PPPLDAPControl;
     freeit          : cbool
   ): cint; cdecl; external;
@@ -1204,7 +1204,7 @@ procedure ldap_add_result_entry(
 function ldap_get_dn(
     ld              : PLDAP;
     entry           : PLDAPMessage
-  ): PChar; cdecl; external;
+  ): pcchar; cdecl; external;
 
 const
   LDAP_AVA_NULL                     = $0000;
@@ -1260,7 +1260,7 @@ function ldap_bv2dn(
   ): cint; cdecl; external;
 
 function ldap_str2dn(
-    const str       : PChar;
+    const str       : pcchar;
     var dn          : LDAPDN;
     flags           : cuint
   ): cint; cdecl; external;
@@ -1273,21 +1273,21 @@ function ldap_dn2bv(
 
 function ldap_dn2str(
     dn              : LDAPDN;
-    var str         : PChar;
+    var str         : pcchar;
     flags           : cuint
   ): cint; cdecl; external;
 
 function ldap_bv2rdn(
     bv              : PBerval;
     var rdn         : LDAPRDN;
-    var next        : PChar;
+    var next        : pcchar;
     flags           : cuint
   ): cint; cdecl; external;
 
 function ldap_str2rdn(
-    const str       : PChar;
+    const str       : pcchar;
     var rdn         : LDAPRDN;
-    var next        : PChar;
+    var next        : pcchar;
     flags           : cuint
   ): cint; cdecl; external;
 
@@ -1299,14 +1299,14 @@ function ldap_rdn2bv(
 
 function ldap_rdn2str(
     rdn             : LDAPRDN;
-    var str         : PChar;
+    var str         : pcchar;
     flags           : cuint
   ): cint; cdecl; external;
 
 function ldap_dn_normalize(
-    const _in       : PChar;
+    const _in       : pcchar;
     iflags          : cuint;
-    var _out        : PChar;
+    var _out        : pcchar;
     oflags          : cuint
   ): cint; cdecl; external;
 
@@ -1345,13 +1345,13 @@ function ldap_first_attribute(
     ld              : PLDAP;
     entry           : PLDAPMessage;
     var ber         : PBerElement
-  ): PChar; cdecl; external;
+  ): pcchar; cdecl; external;
 
 function ldap_next_attribute(
     ld              : PLDAP;
     entry           : PLDAPMessage;
     ber             : PBerElement
-  ): PChar; cdecl; external;
+  ): pcchar; cdecl; external;
 
 
 (*
@@ -1361,7 +1361,7 @@ function ldap_next_attribute(
 function ldap_get_values_len(
     ld              : PLDAP;
     entry           : PLDAPMessage;
-    const target    : PChar
+    const target    : pcchar
   ): PPBerval; cdecl; external;
 
 function ldap_count_values_len(
@@ -1409,10 +1409,10 @@ function ldap_msgdelete(
 
 function ldap_search_ext(
     ld              : PLDAP;
-    const base      : PChar;
+    const base      : pcchar;
     scope           : cint;
-    const filter    : PChar;
-    attrs           : PPChar;
+    const filter    : pcchar;
+    attrs           : ppcchar;
     attrsonly       : cbool;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl;
@@ -1423,10 +1423,10 @@ function ldap_search_ext(
 
 function ldap_search_ext_s(
     ld              : PLDAP;
-    const base      : PChar;
+    const base      : pcchar;
     scope           : cint;
-    const filter    : PChar;
-    attrs           : PPChar;
+    const filter    : pcchar;
+    attrs           : ppcchar;
     attrsonly       : cbool;
     serverctrls     : PPLDAPControl;
     clientctrls     : PPLDAPControl;
@@ -1459,7 +1459,7 @@ function ldap_unbind_ext_s(
 
 function ldap_put_vrFilter(
     ber             : PBerElement;
-    const vrf       : PChar
+    const vrf       : pcchar
   ): cint; cdecl; external;
 
 
@@ -1490,8 +1490,8 @@ procedure ldap_memvfree(
   ); cdecl; external;
 
 function ldap_strdup(
-    const str       : PChar
-  ): PChar; cdecl; external;
+    const str       : pcchar
+  ): pcchar; cdecl; external;
 
 procedure ldap_mods_free(
     mods            : PPLDAPMod;
@@ -1504,25 +1504,25 @@ procedure ldap_mods_free(
  *)
 
 function ldap_is_ldap_url(
-    const url       : PChar
+    const url       : pcchar
   ): cint; cdecl; external;
 
 function ldap_is_ldaps_url(
-    const url       : PChar
+    const url       : pcchar
   ): cint; cdecl; external;
 
 function ldap_is_ldapi_url(
-    const url       : PChar
+    const url       : pcchar
   ): cint; cdecl; external;
 
 function ldap_url_parse(
-    const url       : PChar;
+    const url       : pcchar;
     var ludpp       : PLDAPURLDesc
   ): cint; cdecl; external;
 
 function ldap_url_desc2str(
     ludpp           : PLDAPURLDesc
-  ): PChar; cdecl; external;
+  ): pcchar; cdecl; external;
 
 procedure ldap_free_urldesc(
     ludpp           : PLDAPURLDesc
@@ -1566,15 +1566,15 @@ type
   PPLDAPSortKey                     = ^PLDAPSortKey;
   PLDAPSortKey                      = ^LDAPSortKey;
   LDAPSortKey                       = record
-    attributeType   : PChar;
-    orderingRule    : PChar;
+    attributeType   : pcchar;
+    orderingRule    : pcchar;
     reverseOrder    : cbool;
   end;
 
 
 function ldap_create_sort_keylist(
     var sortKeyList : PPLDAPSortKey;
-    keyString       : PChar
+    keyString       : pcchar
   ): cint; cdecl; external;
 
 procedure ldap_free_sort_keylist(
@@ -1592,7 +1592,7 @@ function ldap_parse_sort_control(
     ld              : PLDAP;
     ctrlp           : PPLDAPControl;
     var result      : culong;
-    var attribute   : PChar
+    var attribute   : pcchar
   ): cint; cdecl; external;
 
 
@@ -1776,7 +1776,7 @@ ldap_parse_passwordpolicy_control LDAP_P((
         int *gracep,
         LDAPPasswordPolicyError *errorp ));
 
-LDAP_F( const char * )
+LDAP_F( const cchar * )
 ldap_passwordpolicy_err2txt LDAP_P(( LDAPPasswordPolicyError ));
 #endif*)
 
@@ -1790,7 +1790,7 @@ const
 
 function ldap_ntlm_bind(
     ld              : PLDAP;
-    const dn        : PChar;
+    const dn        : pcchar;
     tag             : ber_tag_t;
     cred            : PBerval;
     sctrl           : PPLDAPControl;

packages/extra/mad/mad.pas

@@ -199,7 +199,7 @@ procedure mad_timer_add(var timer: mad_timer_t; incr: mad_timer_t); cdecl; exter
 procedure mad_timer_multiply(var timer: mad_timer_t; scalar: cslong); cdecl; external {$IFDEF DYNLINK}madlib{$ENDIF};
 function  mad_timer_count(timer: mad_timer_t; units: mad_units): cslong; cdecl; external {$IFDEF DYNLINK}madlib{$ENDIF};
 function  mad_timer_fraction(timer: mad_timer_t; denom: culong): culong; cdecl; external {$IFDEF DYNLINK}madlib{$ENDIF};
-procedure mad_timer_string(timer: mad_timer_t; dest, format: pchar; units, fracunits: mad_units; subparts: culong); cdecl; external {$IFDEF DYNLINK}madlib{$ENDIF};
+procedure mad_timer_string(timer: mad_timer_t; dest, format: pcchar; units, fracunits: mad_units; subparts: culong); cdecl; external {$IFDEF DYNLINK}madlib{$ENDIF};
 
 
 (***********************************************************************)
@@ -273,7 +273,7 @@ procedure mad_stream_options(stream: mad_stream; opts: cint);
 procedure mad_stream_buffer(var stream: mad_stream; buffer: pcuchar; length: culong); cdecl; external {$IFDEF DYNLINK}madlib{$ENDIF};
 procedure mad_stream_skip(var stream: mad_stream; length: culong); cdecl; external {$IFDEF DYNLINK}madlib{$ENDIF};
 function  mad_stream_sync(var stream: mad_stream): cint; cdecl; external {$IFDEF DYNLINK}madlib{$ENDIF};
-function  mad_stream_errorstr(var stream: mad_stream): pchar; cdecl; external {$IFDEF DYNLINK}madlib{$ENDIF};
+function  mad_stream_errorstr(var stream: mad_stream): pcchar; cdecl; external {$IFDEF DYNLINK}madlib{$ENDIF};
 
 
 (***********************************************************************)

packages/extra/oggvorbis/vorbis.pas

@@ -12,24 +12,22 @@
 
 unit vorbis;
 
-interface
-
+{$mode objfpc}
 {$MINENUMSIZE 4}
 
-uses
-  LibXCPPTypes,
-  libogg;
-
-{.$DEFINE DYNLINK}
+interface
 
-{$IFNDEF FPC}
-  {$DEFINE DYNLINK}
-{$ENDIF}
+uses
+  ctypes, ogg;
 
-{$IFNDEF DYNLINK}
+{$IFDEF WINDOWS}
+{$DEFINE DYNLINK}
+const
+  vorbislib = 'vorbislib.dll';
+  vorbisfilelib = 'vorbisfile.dll';
+  vorbisenclib = 'vorbisenclib.dll';
+{$ELSE}
   {$LINKLIB vorbis}
-  {$LINKLIB vorbisfile}
-//  {$LINKLIB libvorbisenc.a}
 {$ENDIF}
 
 (***********************************************************************)
@@ -37,13 +35,13 @@ uses
 (***********************************************************************)
 
 type
-  pcmfloat = ^pfloat;
+  ppcfloat = ^pcfloat;
 
   pvorbis_info = ^vorbis_info;
   vorbis_info = record
-    version         : int;
-    channels        : int;
-    rate            : long;
+    version         : cint;
+    channels        : cint;
+    rate            : clong;
 
   { The below bitrate declarations are *hints*.
      Combinations of the three values carry the following implications:
@@ -60,10 +58,10 @@ type
        the coder does not care to speculate.
   }
 
-    bitrate_upper   : long;
-    bitrate_nominal : long;
-    bitrate_lower   : long;
-    bitrate_window  : long;
+    bitrate_upper   : clong;
+    bitrate_nominal : clong;
+    bitrate_lower   : clong;
+    bitrate_window  : clong;
     codec_setup     : pointer;
   end;
 
@@ -71,22 +69,22 @@ type
 
   pvorbis_dsp_state = ^vorbis_dsp_state;
   vorbis_dsp_state = record
-    analysisp       : int;
+    analysisp       : cint;
     vi              : pvorbis_info;
 
-    pcm             : pcmfloat;
-    pcmret          : pcmfloat;
-    pcm_storage     : int;
-    pcm_current     : int;
-    pcm_returned    : int;
+    pcm             : ppcfloat;
+    pcmret          : ppcfloat;
+    pcm_storage     : cint;
+    pcm_current     : cint;
+    pcm_returned    : cint;
 
-    preextrapolate  : int;
-    eofflag         : int;
+    preextrapolate  : cint;
+    eofflag         : cint;
 
-    lW              : long;
-    W               : long;
-    nW              : long;
-    centerW         : long;
+    lW              : clong;
+    W               : clong;
+    nW              : clong;
+    centerW         : clong;
 
     granulepos      : ogg_int64_t;
     sequence        : ogg_int64_t;
@@ -110,34 +108,35 @@ type
     next            : palloc_chain;
   end;
 
+  pvorbis_block = ^vorbis_block;
   vorbis_block = record
   { necessary stream state for linking to the framing abstraction }
-    pcm             : pcmfloat;            { this is a pointer into local storage }
+    pcm             : ppcfloat;            { this is a pointer into local storage }
     opb             : oggpack_buffer;
 
-    lW              : long;
-    W               : long;
-    nW              : long;
-    pcmend          : int;
-    mode            : int;
+    lW              : clong;
+    W               : clong;
+    nW              : clong;
+    pcmend          : cint;
+    mode            : cint;
 
-    eofflag         : int;
+    eofflag         : cint;
     granulepos      : ogg_int64_t;
     sequence        : ogg_int64_t;
     vd              : pvorbis_dsp_state; { For read-only access of configuration }
 
   { local storage to avoid remallocing; it's up to the mapping to structure it }
     localstore      : pointer;
-    localtop        : long;
-    localalloc      : long;
-    totaluse        : long;
+    localtop        : clong;
+    localalloc      : clong;
+    totaluse        : clong;
     reap            : palloc_chain;
 
   { bitmetrics for the frame }
-    glue_bits       : long;
-    time_bits       : long;
-    floor_bits      : long;
-    res_bits        : long;
+    glue_bits       : clong;
+    time_bits       : clong;
+    floor_bits      : clong;
+    res_bits        : clong;
 
     internal        : pointer;
   end;
@@ -149,19 +148,13 @@ type
 
 { the comments are not part of vorbis_info so that vorbis_info can be static storage }
 
-  pcomments = ^comments;
-  comments = array[byte] of pchar;
-
-  plengts = ^lengts;
-  lengts = array[byte] of int;
-
   pvorbis_comment = ^vorbis_comment;
   vorbis_comment = record
   { unlimited user comment fields.  libvorbis writes 'libvorbis' whatever vendor is set to in encode }
-    user_comments   : pcomments;
-    comment_lengths : plengts;
-    comments        : int;
-    vendor          : pchar;
+    user_comments   : ^pcchar;
+    comment_lengths : pcint;
+    comments        : cint;
+    vendor          : pcchar;
   end;
 
 
@@ -179,60 +172,50 @@ type
 
 { Vorbis PRIMITIVES: general }
 
-{$IFDEF MSWINDOWS}
-const
-  vorbislib = 'vorbislib.dll';
-{$ENDIF}
-{$IFDEF LINUX}
-const
-  vorbislib = 'libvorbis.so';
-{$ENDIF}
-
-procedure vorbis_info_init(var vi: vorbis_info); cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_info_init'{$ENDIF};
-procedure vorbis_info_clear(var vi: vorbis_info); cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_info_clear'{$ENDIF};
-function  vorbis_info_blocksize(var vi: vorbis_info; zo: int): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_info_blocksize'{$ENDIF};
-procedure vorbis_comment_init(var vc: vorbis_comment); cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_comment_init'{$ENDIF};
-procedure vorbis_comment_add(var vc: vorbis_comment; comment: pchar); cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_comment_add'{$ENDIF};
-procedure vorbis_comment_add_tag(var vc: vorbis_comment; tag: pchar; contents: pchar); cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_comment_add_tag'{$ENDIF};
-function  vorbis_comment_query(var vc: vorbis_comment; tag: pchar; count: int): pchar; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_comment_query'{$ENDIF};
-function  vorbis_comment_query_count(var vc: vorbis_comment; tag: pchar): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_comment_query_count'{$ENDIF};
-procedure vorbis_comment_clear(var vc: vorbis_comment); cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_comment_clear'{$ENDIF};
-
-function  vorbis_block_init(var v: vorbis_dsp_state; var vb: vorbis_block): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_block_init'{$ENDIF};
-function  vorbis_block_clear(var vb: vorbis_block): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_block_clear'{$ENDIF};
-procedure vorbis_dsp_clear(var v: vorbis_dsp_state); cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_dsp_clear'{$ENDIF};
-function  vorbis_granule_time(var v: vorbis_dsp_state; granulepos: ogg_int64_t): Double; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_granule_time'{$ENDIF};
+procedure vorbis_info_init(var vi: vorbis_info); cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+procedure vorbis_info_clear(var vi: vorbis_info); cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_info_blocksize(var vi: vorbis_info; zo: cint): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+procedure vorbis_comment_init(var vc: vorbis_comment); cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+procedure vorbis_comment_add(var vc: vorbis_comment; comment: pchar); cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+procedure vorbis_comment_add_tag(var vc: vorbis_comment; tag: pchar; contents: pchar); cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_comment_query(var vc: vorbis_comment; tag: pchar; count: cint): pchar; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_comment_query_count(var vc: vorbis_comment; tag: pchar): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+procedure vorbis_comment_clear(var vc: vorbis_comment); cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+
+function  vorbis_block_init(var v: vorbis_dsp_state; var vb: vorbis_block): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_block_clear(var vb: vorbis_block): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+procedure vorbis_dsp_clear(var v: vorbis_dsp_state); cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_granule_time(var v: vorbis_dsp_state; granulepos: ogg_int64_t): cdouble; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
 
 { vorbislib PRIMITIVES: analysis/DSP layer }
 
-function  vorbis_analysis_init(var v: vorbis_dsp_state; var vi: vorbis_info): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_analysis_init'{$ENDIF};
-function  vorbis_commentheader_out(var vc: vorbis_comment; var op: ogg_packet): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_commentheader_out'{$ENDIF};
-function  vorbis_analysis_headerout(var v:vorbis_dsp_state; var vc: vorbis_comment; var op: ogg_packet;
-					  var op_comm: ogg_packet; var op_code: ogg_packet): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_analysis_headerout'{$ENDIF};
-function  vorbis_analysis_buffer(var v: vorbis_dsp_state; vals: int): pcmfloat; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_analysis_buffer'{$ENDIF};
-function  vorbis_analysis_wrote(var v: vorbis_dsp_state; vals: int): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_analysis_wrote'{$ENDIF};
-function  vorbis_analysis_blockout(var v: vorbis_dsp_state; var vb: vorbis_block): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_analysis_blockout'{$ENDIF};
-function  vorbis_analysis(var vb: vorbis_block; var op: ogg_packet): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_analysis'{$ENDIF};
+function  vorbis_analysis_init(var v: vorbis_dsp_state; var vi: vorbis_info): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_commentheader_out(var vc: vorbis_comment; var op: ogg_packet): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_analysis_headerout(var v:vorbis_dsp_state; var vc: vorbis_comment; var op: ogg_packet; var op_comm: ogg_packet; var op_code: ogg_packet): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_analysis_buffer(var v: vorbis_dsp_state; vals: cint): ppcfloat; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_analysis_wrote(var v: vorbis_dsp_state; vals: cint): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_analysis_blockout(var v: vorbis_dsp_state; var vb: vorbis_block): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_analysis(var vb: vorbis_block; var op: ogg_packet): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
 
-function  vorbis_bitrate_addblock(var vb: vorbis_block): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_bitrate_addblock'{$ENDIF};
-function  vorbis_bitrate_flushpacket(var vd: vorbis_dsp_state; var op: ogg_packet): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_bitrate_flushpacket'{$ENDIF};
+function  vorbis_bitrate_addblock(var vb: vorbis_block): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_bitrate_flushpacket(var vd: vorbis_dsp_state; var op: ogg_packet): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
 
 { vorbislib PRIMITIVES: synthesis layer }
 
-function  vorbis_synthesis_headerin(var vi: vorbis_info; var vc: vorbis_comment; var op: ogg_packet): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_synthesis_headerin'{$ENDIF};
+function  vorbis_synthesis_headerin(var vi: vorbis_info; var vc: vorbis_comment; var op: ogg_packet): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
 
-function  vorbis_synthesis_init(var v: vorbis_dsp_state; var vi: vorbis_info): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_synthesis_init'{$ENDIF};
-function  vorbis_synthesis_restart(var v: vorbis_dsp_state): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_synthesis_restart'{$ENDIF};
-function  vorbis_synthesis(var vb: vorbis_block; var op: ogg_packet): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_synthesis'{$ENDIF};
-function  vorbis_synthesis_trackonly(var vb: vorbis_block; var op: ogg_packet): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_synthesis_trackonly'{$ENDIF};
-function  vorbis_synthesis_blockin(var v: vorbis_dsp_state; var vb: vorbis_block): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_synthesis_blockin'{$ENDIF};
-function  vorbis_synthesis_pcmout(var v: vorbis_dsp_state; var pcm: pcmfloat): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_synthesis_pcmout'{$ENDIF};
-function  vorbis_synthesis_lapout(var v: vorbis_dsp_state; var pcm: pcmfloat): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_synthesis_lapout'{$ENDIF};
-function  vorbis_synthesis_read(var v: vorbis_dsp_state; samples: int): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_synthesis_read'{$ENDIF};
-function  vorbis_packet_blocksize(var vi: vorbis_info; var op: ogg_packet): long; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_packet_blocksize'{$ENDIF};
+function  vorbis_synthesis_init(var v: vorbis_dsp_state; var vi: vorbis_info): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_synthesis_restart(var v: vorbis_dsp_state): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_synthesis(var vb: vorbis_block; var op: ogg_packet): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_synthesis_trackonly(var vb: vorbis_block; var op: ogg_packet): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_synthesis_blockin(var v: vorbis_dsp_state; var vb: vorbis_block): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_synthesis_pcmout(var v: vorbis_dsp_state; var pcm: ppcfloat): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_synthesis_lapout(var v: vorbis_dsp_state; var pcm: ppcfloat): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_synthesis_read(var v: vorbis_dsp_state; samples: cint): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_packet_blocksize(var vi: vorbis_info; var op: ogg_packet): clong; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
 
-function  vorbis_synthesis_halfrate(var v: vorbis_info; flag: int): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_synthesis_halfrate'{$ENDIF};
-function  vorbis_synthesis_halfrate_p(var v: vorbis_info): int; cdecl; External{$IFDEF DYNLINK} vorbislib name 'vorbis_synthesis_halfrate_p'{$ENDIF};
+function  vorbis_synthesis_halfrate(var v: vorbis_info; flag: cint): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
+function  vorbis_synthesis_halfrate_p(var v: vorbis_info): cint; cdecl; external {$IFDEF DYNLINK}vorbislib{$ENDIF};
 
 { vorbislib ERRORS and return codes }
 Const
@@ -272,9 +255,9 @@ type
  *}
 
   read_func  = function(ptr: pointer; size, nmemb: Longword; datasource: pointer): LongWord; cdecl;
-  seek_func  = function(datasource: pointer; offset: ogg_int64_t; whence: int): int; cdecl;
-  close_func = function(datasource: pointer): int; cdecl;
-  tell_func  = function(datasource: pointer): long; cdecl;
+  seek_func  = function(datasource: pointer; offset: ogg_int64_t; whence: cint): cint; cdecl;
+  close_func = function(datasource: pointer): cint; cdecl;
+  tell_func  = function(datasource: pointer): clong; cdecl;
 
   ov_callbacks = record
     read            : read_func;
@@ -293,28 +276,28 @@ const
 type
   OggVorbis_File = record
     datasource      : pointer; { pointer to a FILE *, etc. }
-    seekable        : int;
+    seekable        : cint;
     offset          : ogg_int64_t;
     end_            : ogg_int64_t;
     oy              : ogg_sync_state;
 
   { If the FILE handle isn't seekable (eg, a pipe), only the current stream appears }
-    links           : int;
+    links           : cint;
     offsets         : ^ogg_int64_t;
     dataoffsets     : ^ogg_int64_t;
-    serialnos       : ^long;
+    serialnos       : ^clong;
     pcmlengths      : ^ogg_int64_t; { overloaded to maintain binary compatability; x2 size, stores both beginning and end values }
     vi              : pvorbis_info;
     vc              : pvorbis_comment;
 
   { Decoding working state local storage }
     pcm_offset      : ogg_int64_t;
-    ready_state     : int;
-    current_serialno: long;
-    current_link    : int;
+    ready_state     : cint;
+    current_serialno: clong;
+    current_link    : cint;
 
-    bittrack        : double;
-    samptrack       : double;
+    bittrack        : cdouble;
+    samptrack       : cdouble;
 
     os              : ogg_stream_state; { take physical pages, weld into a logical stream of packets }
     vd              : vorbis_dsp_state; { central working state for the packet->PCM decoder }
@@ -323,73 +306,56 @@ type
     callbacks       : ov_callbacks;
   end;
 
-{$IFDEF MSWINDOWS}
-const
-  vorbisfilelib = 'vorbisfile.dll';
-{$ENDIF}
-{$IFDEF LINUX}
-const
-  vorbisfilelib = 'libvorbisfile.so';
-{$ENDIF}
 
-function ov_clear(var vf: OggVorbis_File): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_clear'{$ENDIF};
-function ov_open(f: pointer; var vf: OggVorbis_File; initial: pointer; ibytes: long): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_open'{$ENDIF};
-function ov_open_callbacks(datasource: pointer; var vf: OggVorbis_File; initial: pointer; ibytes: long; callbacks: ov_callbacks): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_open_callbacks'{$ENDIF};
+function ov_clear(var vf: OggVorbis_File): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_open(f: pointer; var vf: OggVorbis_File; initial: pointer; ibytes: clong): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_open_callbacks(datasource: pointer; var vf: OggVorbis_File; initial: pointer; ibytes: clong; callbacks: ov_callbacks): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
 
-function ov_test(f: pointer; var vf: OggVorbis_File; initial: pointer; ibytes: long): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_test'{$ENDIF};
-function ov_test_callbacks(datasource: pointer; var vf: OggVorbis_File; initial: pointer; ibytes: long; callbacks: ov_callbacks): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_test_callbacks'{$ENDIF};
-function ov_test_open(var vf: OggVorbis_File): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_test_open'{$ENDIF};
+function ov_test(f: pointer; var vf: OggVorbis_File; initial: pointer; ibytes: clong): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_test_callbacks(datasource: pointer; var vf: OggVorbis_File; initial: pointer; ibytes: clong; callbacks: ov_callbacks): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_test_open(var vf: OggVorbis_File): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
 
-function ov_bitrate(var vf: OggVorbis_File; i: int): long; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_bitrate'{$ENDIF};
-function ov_bitrate_instant(var vf: OggVorbis_File): long; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_bitrate_instant'{$ENDIF};
-function ov_streams(var vf: OggVorbis_File): long; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_streams'{$ENDIF};
-function ov_seekable(var vf: OggVorbis_File): long; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_seekable'{$ENDIF};
-function ov_serialnumber(var vf: OggVorbis_File; i: int): long; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_serialnumber'{$ENDIF};
+function ov_bitrate(var vf: OggVorbis_File; i: cint): clong; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_bitrate_instant(var vf: OggVorbis_File): clong; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_streams(var vf: OggVorbis_File): clong; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_seekable(var vf: OggVorbis_File): clong; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_serialnumber(var vf: OggVorbis_File; i: cint): clong; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
 
-function ov_raw_total(var vf: OggVorbis_File; i: int): ogg_int64_t; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_raw_total'{$ENDIF};
-function ov_pcm_total(var vf: OggVorbis_File; i: int): ogg_int64_t; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_pcm_total'{$ENDIF};
-function ov_time_total(var vf: OggVorbis_File; i: int): Double; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_time_total'{$ENDIF};
+function ov_raw_total(var vf: OggVorbis_File; i: cint): ogg_int64_t; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_pcm_total(var vf: OggVorbis_File; i: cint): ogg_int64_t; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_time_total(var vf: OggVorbis_File; i: cint): cdouble; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
 
-function ov_raw_seek(var vf: OggVorbis_File; pos: ogg_int64_t): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_raw_seek'{$ENDIF};
-function ov_pcm_seek(var vf: OggVorbis_File; pos: ogg_int64_t): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_pcm_seek'{$ENDIF};
-function ov_pcm_seek_page(var vf: OggVorbis_File; pos: ogg_int64_t): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_pcm_seek_page'{$ENDIF};
-function ov_time_seek(var vf: OggVorbis_File; pos: double): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_time_seek'{$ENDIF};
-function ov_time_seek_page(var vf: OggVorbis_File; pos: double): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_time_seek_page'{$ENDIF};
+function ov_raw_seek(var vf: OggVorbis_File; pos: ogg_int64_t): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_pcm_seek(var vf: OggVorbis_File; pos: ogg_int64_t): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_pcm_seek_page(var vf: OggVorbis_File; pos: ogg_int64_t): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_time_seek(var vf: OggVorbis_File; pos: cdouble): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_time_seek_page(var vf: OggVorbis_File; pos: cdouble): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
 
-function ov_raw_seek_lap(var vf: OggVorbis_File; pos: ogg_int64_t): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_raw_seek_lap'{$ENDIF};
-function ov_pcm_seek_lap(var vf: OggVorbis_File; pos: ogg_int64_t): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_pcm_seek_lap'{$ENDIF};
-function ov_pcm_seek_page_lap(var vf: OggVorbis_File; pos: ogg_int64_t): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_pcm_seek_page_lap'{$ENDIF};
-function ov_time_seek_lap(var vf: OggVorbis_File; pos: double): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_time_seek_lap'{$ENDIF};
-function ov_time_seek_page_lap(var vf: OggVorbis_File; pos: double): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_time_seek_page_lap'{$ENDIF};
+function ov_raw_seek_lap(var vf: OggVorbis_File; pos: ogg_int64_t): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_pcm_seek_lap(var vf: OggVorbis_File; pos: ogg_int64_t): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_pcm_seek_page_lap(var vf: OggVorbis_File; pos: ogg_int64_t): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_time_seek_lap(var vf: OggVorbis_File; pos: cdouble): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_time_seek_page_lap(var vf: OggVorbis_File; pos: cdouble): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
 
-function ov_raw_tell(var vf: OggVorbis_File): ogg_int64_t; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_raw_tell'{$ENDIF};
-function ov_pcm_tell(var vf: OggVorbis_File): ogg_int64_t; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_pcm_tell'{$ENDIF};
-function ov_time_tell(var vf: OggVorbis_File): Double; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_time_tell'{$ENDIF};
+function ov_raw_tell(var vf: OggVorbis_File): ogg_int64_t; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_pcm_tell(var vf: OggVorbis_File): ogg_int64_t; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_time_tell(var vf: OggVorbis_File): cdouble; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
 
-function ov_info(var vf: OggVorbis_File; link: int): pvorbis_info; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_info'{$ENDIF};
-function ov_comment(var vf: OggVorbis_File; link: int): pvorbis_comment; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_comment'{$ENDIF};
+function ov_info(var vf: OggVorbis_File; link: cint): pvorbis_info; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_comment(var vf: OggVorbis_File; link: cint): pvorbis_comment; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
 
-function ov_read_float(var vf: OggVorbis_File; var pcm_channels: pcmfloat; samples: int; bitstream: pint): long; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_read_float'{$ENDIF};
-function ov_read(var vf: OggVorbis_File; buffer: pointer; length, bigendianp, word, sgned: int; bitstream: Pint): long; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_read'{$ENDIF};
-function ov_crosslap(var vf1: OggVorbis_File; var vf2: OggVorbis_File): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_crosslap'{$ENDIF};
+function ov_read_float(var vf: OggVorbis_File; var pcm_channels: ppcfloat; samples: cint; bitstream: pcint): clong; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_read(var vf: OggVorbis_File; buffer: pointer; length, bigendianp, word, sgned: cint; bitstream: pcint): clong; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_crosslap(var vf1: OggVorbis_File; var vf2: OggVorbis_File): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
 
-function ov_halfrate(var vf: OggVorbis_File; flag: int): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_halfrate'{$ENDIF};
-function ov_halfrate_p(var vf: OggVorbis_File): int; cdecl; External{$IFDEF DYNLINK} vorbisfilelib name 'ov_halfrate_p'{$ENDIF};
+function ov_halfrate(var vf: OggVorbis_File; flag: cint): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
+function ov_halfrate_p(var vf: OggVorbis_File): cint; cdecl; external {$IFDEF DYNLINK}vorbisfilelib{$ENDIF};
 
 
 (***********************************************************************)
 (* Header : vorbisenc.h                                                *)
 (***********************************************************************)
 
-{$IFDEF MSWINDOWS}
-const
-  vorbisenclib = 'vorbisenclib.dll';
-{$ENDIF}
-{$IFDEF LINUX}
-const
-  vorbisenclib = 'libvorbisenc.so';
-{$ENDIF}
-
 const
   OV_ECTL_RATEMANAGE_GET       = $10;
 
@@ -405,25 +371,25 @@ const
 
 type
   ovectl_ratemanage_arg = record
-    management_active        : int;
+    management_active        : cint;
 
-    bitrate_hard_min         : long;
-    bitrate_hard_max         : long;
-    bitrate_hard_window      : double;
+    bitrate_hard_min         : clong;
+    bitrate_hard_max         : clong;
+    bitrate_hard_window      : cdouble;
 
-    bitrate_av_lo            : long;
-    bitrate_av_hi            : long;
-    bitrate_av_window        : double;
-    bitrate_av_window_center : double;
+    bitrate_av_lo            : clong;
+    bitrate_av_hi            : clong;
+    bitrate_av_window        : cdouble;
+    bitrate_av_window_center : cdouble;
   end;
 
-function vorbis_encode_init(var vi: vorbis_info; channels, rate, max_bitrate, nominal_bitrate, min_bitrate: long): int; cdecl; External{$IFDEF DYNLINK} vorbisenclib name 'vorbis_encode_init'{$ENDIF};
-function vorbis_encode_setup_managed(var vi: vorbis_info; channels, rate, max_bitrate, nominal_bitrate, min_bitrate: long): int; cdecl; External{$IFDEF DYNLINK} vorbisenclib name 'vorbis_encode_setup_managed'{$ENDIF};
-function vorbis_encode_setup_vbr(var vi: vorbis_info; channels, rate: long; quality: float): int; cdecl; External{$IFDEF DYNLINK} vorbisenclib name 'vorbis_encode_setup_vbr'{$ENDIF};
+function vorbis_encode_init(var vi: vorbis_info; channels, rate, max_bitrate, nominal_bitrate, min_bitrate: clong): cint; cdecl; external {$IFDEF DYNLINK}vorbisenclib{$ENDIF};
+function vorbis_encode_setup_managed(var vi: vorbis_info; channels, rate, max_bitrate, nominal_bitrate, min_bitrate: clong): cint; cdecl; external {$IFDEF DYNLINK}vorbisenclib{$ENDIF};
+function vorbis_encode_setup_vbr(var vi: vorbis_info; channels, rate: clong; quality: cfloat): cint; cdecl; external {$IFDEF DYNLINK}vorbisenclib{$ENDIF};
 (* quality level from 0. (lo) to 1. (hi) *)
-function vorbis_encode_init_vbr(var vi: vorbis_info; channels, rate: long; base_quality: float): int; cdecl; External{$IFDEF DYNLINK} vorbisenclib name 'vorbis_encode_init_vbr'{$ENDIF};
-function vorbis_encode_setup_init(var vi: vorbis_info): int; cdecl; External{$IFDEF DYNLINK} vorbisenclib name 'vorbis_encode_setup_init'{$ENDIF};
-function vorbis_encode_ctl(var vi: vorbis_info; number: int; arg: pointer): int; cdecl; External{$IFDEF DYNLINK} vorbisenclib name 'vorbis_encode_ctl'{$ENDIF};
+function vorbis_encode_init_vbr(var vi: vorbis_info; channels, rate: clong; base_quality: cfloat): cint; cdecl; external {$IFDEF DYNLINK}vorbisenclib{$ENDIF};
+function vorbis_encode_setup_init(var vi: vorbis_info): cint; cdecl; external {$IFDEF DYNLINK}vorbisenclib{$ENDIF};
+function vorbis_encode_ctl(var vi: vorbis_info; number: cint; arg: pointer): cint; cdecl; external {$IFDEF DYNLINK}vorbisenclib{$ENDIF};
 
 implementation
 

packages/extra/openal/alch.inc

@@ -25,8 +25,8 @@ type
   PALCboolean                       = pcbool;
 
 (** character *)
-  ALCchar                           = char;
-  PALCchar                          = pchar;
+  ALCchar                           = cchar;
+  PALCchar                          = pcchar;
 
 (** signed 8-bit 2's complement integer *)
   ALCbyte                           = cint8;

packages/extra/openal/alh.inc

@@ -43,8 +43,8 @@ type
   PALboolean                        = pcbool;
 
 (** character *)
-  ALchar                            = char;
-  PALchar                           = pchar;
+  ALchar                            = cchar;
+  PALchar                           = pcchar;
 
 (** signed 8-bit 2's complement integer *)
   ALbyte                            = cint8;