--- Merging r14481 into '.':

U    rtl/inc/systemh.inc
U    packages/fcl-extra/src/win/ServiceManager.pas
U    packages/libc/src/glue.inc
U    packages/tcl/src/tcl80.pp
U    packages/opengl/src/glut.pp
U    packages/gnome1/src/libgnome/libgnome.pp
U    packages/fcl-db/src/dbase/dbf_prsdef.pas
U    packages/sqlite/src/sqlite.pp
U    packages/sqlite/src/sqlite3.inc
U    packages/libgd/src/gd.pas
U    packages/dbus/src/dbus-types.inc
U    packages/bfd/src/bfd.pas
U    packages/mysql/src/mysql4_comtypes.inc
U    packages/mysql/src/mysql.inc
U    packages/gtk1/src/gdk/gdktypes.pp
U    packages/gtk2/src/glib/gtypes.inc
U    packages/x11/src/x.pp
U    packages/libpng/src/png.pp

# revisions: 14481
------------------------------------------------------------------------
r14481 | florian | 2009-12-26 21:47:24 +0100 (Sat, 26 Dec 2009) | 1 line
Changed paths:
   M /trunk/packages/bfd/src/bfd.pas
   M /trunk/packages/dbus/src/dbus-types.inc
   M /trunk/packages/fcl-db/src/dbase/dbf_prsdef.pas
   M /trunk/packages/fcl-extra/src/win/ServiceManager.pas
   M /trunk/packages/gnome1/src/libgnome/libgnome.pp
   M /trunk/packages/gtk1/src/gdk/gdktypes.pp
   M /trunk/packages/gtk2/src/glib/gtypes.inc
   M /trunk/packages/libc/src/glue.inc
   M /trunk/packages/libgd/src/gd.pas
   M /trunk/packages/libpng/src/png.pp
   M /trunk/packages/mysql/src/mysql.inc
   M /trunk/packages/mysql/src/mysql4_comtypes.inc
   M /trunk/packages/opengl/src/glut.pp
   M /trunk/packages/sqlite/src/sqlite.pp
   M /trunk/packages/sqlite/src/sqlite3.inc
   M /trunk/packages/tcl/src/tcl80.pp
   M /trunk/packages/x11/src/x.pp
   M /trunk/rtl/inc/systemh.inc

* cleaned up redundant declarations of types like PP(P)Char/Byte and moved them to the system unit
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@14712 -

packages/bfd/src/bfd.pas

@@ -132,7 +132,6 @@ type
 
   flagword = LongWord;  (* 32 bits of flags *)
 
-  pppchar = ^ppchar;
   Pbfd_byte = ^bfd_byte;
   bfd_byte = Byte;
   bfd_boolean = LongBool;

packages/dbus/src/dbus-types.inc

@@ -29,8 +29,6 @@ type
 
 { boolean size must be fixed at 4 bytes due to wire protocol! }
   dbus_bool_t = dbus_uint32_t;
-
-  PPPChar = ^PPChar;
   
   va_list = Pointer;
 

packages/fcl-db/src/dbase/dbf_prsdef.pas

@@ -18,15 +18,10 @@ type
   TExpressionType = (etInteger, etString, etBoolean, etLargeInt, etFloat, etDateTime,
     etLeftBracket, etRightBracket, etComma, etUnknown);
 
-  PPChar = ^PChar;
-  PBoolean = ^Boolean;
-  PInteger = ^Integer;
-  PDateTime = ^TDateTime;
   EParserException = class(Exception);
   PExpressionRec = ^TExpressionRec;
   PDynamicType = ^TDynamicType;
   PDateTimeRec = ^TDateTimeRec;
-  PDouble = ^Double;
 {$ifdef SUPPORT_INT64}
   PLargeInt = ^Int64;
 {$endif}

packages/fcl-extra/src/win/ServiceManager.pas

@@ -202,7 +202,6 @@ ResourceString
 {$ifdef ver130}
 
 Type
-  PPChar = ^PChar;
   PCharArray = Array[Word] of PChar;
   PPCharArray = ^PCharArray;
 

packages/gnome1/src/libgnome/libgnome.pp

@@ -15,7 +15,6 @@ const
  libgnomedll='gnome';
 
 Type
-  PPPChar = ^PPChar;
   PPPgChar = ^PPgChar;
   PPPgfloat = ^PPgfloat;
   PPgfloat = ^Pgfloat;

packages/gtk1/src/gdk/gdktypes.pp

@@ -8,7 +8,6 @@
 {$ifdef read_interface}
 
    type
-     PPPChar   = ^PPchar;
      PPguchar  = Pguchar;
      PPgchar   = ^Pgchar;
      PPPgchar  = ^PPgchar;

packages/gtk2/src/glib/gtypes.inc

@@ -12,7 +12,6 @@
      qword = Int64;
    {$ENDIF}
 
-   PPPchar  = ^PPchar;
    PPPgchar = ^PPgchar;
    PPgchar  = ^Pgchar;
    {$IFNDEF KYLIX}

packages/libc/src/glue.inc

@@ -15,8 +15,6 @@ Type
   wchar_t = widechar;
   Pwchar_t = ^wchar_t;
   PPwchar_t = ^Pwchar_t;
-  PPByte = ^PByte;
-  PPPChar = ^PPChar;
 
 { ---------------------------------------------------------------------
     Declarations moved forward because C headers are a mess.

packages/libgd/src/gd.pas

@@ -56,7 +56,6 @@ uses
 
 type
   ppcint = ^pcint;
-  ppbyte = ^pbyte;
   PFILE = pointer;
 
 const

packages/libpng/src/png.pp

@@ -78,9 +78,7 @@ type
    png_charpp = PPchar;
    ppng_charpp = ^png_charpp;
    png_fixed_point_pp = PPpng_fixed_point;
-   PPDouble = ^PDouble;
    png_doublepp = PPdouble;
-   PPPChar = ^PPCHar;
    png_charppp = PPPchar;
    Pcharf = Pchar;
    PPcharf = ^Pcharf;

packages/mysql/src/mysql.inc

@@ -77,9 +77,6 @@ uses
        Pmy_socket = ^my_socket;
        my_socket = cint;
 
-       pppchar = ^ppchar;
-       PPByte     = ^PByte;
-
 {  ------------ Start of declaration in "mysql_com.h"   ---------------------  }
 
   {

packages/mysql/src/mysql4_comtypes.inc

@@ -7,7 +7,6 @@ type
     PVIO = Pointer;
     My_socket = longint;
     my_bool = byte;
-    pppchar = ^PPChar;
     gptr = Pointer;
 
   {

packages/opengl/src/glut.pp

@@ -60,8 +60,6 @@ uses
   GL;
 
 type
-  PInteger = ^Integer;
-  PPChar = ^PChar;
   TGlutVoidCallback = procedure; cdecl;
   TGlut1IntCallback = procedure(value: Integer); cdecl;
   TGlut2IntCallback = procedure(v1, v2: Integer); cdecl;

packages/sqlite/src/sqlite.pp

@@ -91,7 +91,6 @@ const
   SQLITE_ARGS    = -3;
 
 Type
-  PPPchar   = ^ppchar;
   Psqlite = Pointer;
   Psqlite_vm = Pointer;
   PPsqlite_vm = ^Psqlite_vm;

packages/sqlite/src/sqlite3.inc

@@ -33,9 +33,6 @@ const
   {$DEFINE S}
 {$ENDIF}
 
-type
-  PPPChar = ^PPChar;
-
 (*
 ** 2001 September 15
 **

packages/tcl/src/tcl80.pp

@@ -560,7 +560,6 @@ const
 
 
 type
-    PPChar          = ^PChar;
     Tcl_Argv        = PPChar;
     Tcl_ClientData  = pointer;
     Tcl_FreeProc    = procedure(block : pointer); cdecl;

packages/x11/src/x.pp

@@ -19,19 +19,8 @@ uses
     x.h
 }
 
-{ Pointers to basic pascal types, inserted by h2pas conversion program.}
-Type
-  PPLongint = ^PLongint;
-  PPByte    = ^PByte;
-  PPChar    = ^PChar;
-  PPPChar   = ^PPChar;
-  PPWideChar  = ^PWideChar;
-  PPPWideChar = ^PPWideChar;
-
-
 {$PACKRECORDS C}
 
-
 const
    X_PROTOCOL = 11;
    X_PROTOCOL_REVISION = 0;

rtl/inc/systemh.inc

@@ -274,6 +274,7 @@ Type
 { Zero - terminated strings }
   PChar               = ^Char;
   PPChar              = ^PChar;
+  PPPChar             = ^PPChar;
 
   { AnsiChar is equivalent of Char, so we need
     to use type renamings }
@@ -305,6 +306,8 @@ Type
   PSingle             = ^Single;
   PDouble             = ^Double;
   PExtended           = ^Extended;
+
+  PPDouble            = ^PDouble;
 {$endif}
   PCurrency           = ^Currency;
 {$ifdef SUPPORT_COMP}
@@ -326,6 +329,9 @@ Type
   PPtrUInt            = ^PtrUInt;
   PSizeInt            = ^SizeInt;
 
+  PPByte              = ^PByte;
+  PPLongint           = ^PLongint;
+
   PPointer            = ^Pointer;
   PPPointer           = ^PPointer;
 
@@ -346,6 +352,7 @@ Type
 
   PWideChar           = ^WideChar;
   PPWideChar          = ^PWideChar;
+  PPPWideChar         = ^PPWideChar;
   WChar               = Widechar;
   UCS2Char            = WideChar;
   PUCS2Char           = PWideChar;