* ctypes.inc moved to unix/

rtl/bsd/ctypes.inc

@@ -1,107 +0,0 @@
-{
-    $Id$
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 2001 by Free Pascal development team
-
-    Basic types for C interfacing. Check the 64-bit defines.    
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{***********************************************************************}
-{                       POSIX TYPE DEFINITIONS                          }
-{***********************************************************************}
-
-{ Introduced defines
-    - 64bitarch (for 64-bits OSS BSD systems)
-}
-
-Type
-    { the following type definitions are compiler dependant }
-    { and system dependant                                  }
-
-    cInt8  = shortint;
-    cUInt8 = byte;
-    cUInt16= word;
-    cInt16 = smallint;
-    cInt32 = longint;
-    cUInt32= cardinal;
-    cInt64 = int64;
-{$ifndef VER1_0}
-    cUInt64= qword;
-{$else}
-    cUInt64= int64;
-{$endif}
-
-    cuchar = byte;
-    cchar  = shortint;
-    cInt   = longint;           { minimum range is : 32-bit    }
-    cUInt  = Cardinal;          { minimum range is : 32-bit    }
-  {$ifdef CPU64}
-    cLong  = int64;
-  {$ifdef VER1_0}
-    cuLong = int64;
-  {$else}
-    cuLong = qword;
-   {$endif}
-  {$else}
-    cLong  = longint;
-    cuLong = Cardinal;
-  {$endif}
-    clonglong = int64;
-{$ifndef VER1_0}
-    culonglong = qword;
-{$else VER1_0}
-    culonglong = int64;
-{$endif VER1_0}
-    cshort = integer;
-    cushort= word;
-
-    pcInt   = ^cInt;
-    pcUInt  = ^cUInt;
-    pcLong  = ^cLong;
-    pculong = ^cuLong;
-    pcshort = ^cshort;
-    pcushort= ^cushort;
-    pcchar   = ^cchar;
-    pcuchar  = ^cuchar;
-
-    cunsigned = cuint;
-    pcunsigned = ^cunsigned;
-
-{   
-   $Log$
-   Revision 1.5  2005-02-06 08:50:22  florian
-     + added the new types from linux
-
-   Revision 1.4  2004/09/09 20:29:06  jonas
-     * fixed definition of pthread_mutex_t for non-linux targets (and for
-       linux as well, actually).
-     * base libpthread definitions are now in ptypes.inc, included in unixtype
-       They sometimes have an extra underscore in front of their name, in
-       case they were also exported by the packages/base/pthreads unit, so
-       they can keep their original name there
-     * cthreadds unit now imports systuils, because it uses exceptions (it
-       already did so before as well)
-     * fixed many linux definitions of libpthread functions in pthrlinux.inc
-       (integer -> cint etc)
-     + added culonglong type to ctype.inc
-
-   Revision 1.3  2004/05/17 19:20:09  marco
-    * x86_64 patches
-
-   Revision 1.2  2003/09/16 21:20:40  marco
-    * pointer's of some basetypes
-
-   Revision 1.1  2003/01/03 11:21:32  marco
-    * copied and checked from Linux.
-
-
-}
-

rtl/darwin/Makefile

@@ -1845,12 +1845,12 @@ dateutils$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) sysutils$(PPUEXT) mat
 strings$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(INC)/strings.pp $(INC)/stringsi.inc\
 		   $(PROCINC)/strings.inc $(PROCINC)/stringss.inc\
 		   $(SYSTEMUNIT)$(PPUEXT)
-baseunix$(PPUEXT) : unixtype$(PPUEXT) sysctl$(PPUEXT) errno.inc ptypes.inc $(BSDINC)/ctypes.inc \
+baseunix$(PPUEXT) : unixtype$(PPUEXT) sysctl$(PPUEXT) errno.inc ptypes.inc $(UNIXINC)/ctypes.inc \
   signal.inc $(UNIXINC)/bunxh.inc \
   $(BSDINC)/bunxsysc.inc \
   $(BSDINC)/ostypes.inc $(BSDINC)/osmacro.inc $(UNIXINC)/gensigset.inc \
   $(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
-unixtype$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(UNIXINC)/unixtype.pp ptypes.inc $(BSDINC)/ctypes.inc $(SYSTEMUNIT)$(PPUEXT)
+unixtype$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(UNIXINC)/unixtype.pp ptypes.inc $(UNIXINC)/ctypes.inc $(SYSTEMUNIT)$(PPUEXT)
 unix$(PPUEXT) : unixtype$(PPUEXT) baseunix$(PPUEXT) unixutil$(PPUEXT) strings$(PPUEXT) $(UNIXINC)/unix.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \
 		 unxconst.inc $(UNIXINC)/timezone.inc \
 		 unxfunc.inc baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)

rtl/darwin/Makefile.fpc

@@ -125,13 +125,13 @@ strings$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(INC)/strings.pp $(INC)/stringsi.inc\
 # System Dependent Units
 #
 
-baseunix$(PPUEXT) : unixtype$(PPUEXT) sysctl$(PPUEXT) errno.inc ptypes.inc $(BSDINC)/ctypes.inc \
+baseunix$(PPUEXT) : unixtype$(PPUEXT) sysctl$(PPUEXT) errno.inc ptypes.inc $(UNIXINC)/ctypes.inc \
   signal.inc $(UNIXINC)/bunxh.inc \
   $(BSDINC)/bunxsysc.inc \
   $(BSDINC)/ostypes.inc $(BSDINC)/osmacro.inc $(UNIXINC)/gensigset.inc \
   $(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
 
-unixtype$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(UNIXINC)/unixtype.pp ptypes.inc $(BSDINC)/ctypes.inc $(SYSTEMUNIT)$(PPUEXT)
+unixtype$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(UNIXINC)/unixtype.pp ptypes.inc $(UNIXINC)/ctypes.inc $(SYSTEMUNIT)$(PPUEXT)
 
 unix$(PPUEXT) : unixtype$(PPUEXT) baseunix$(PPUEXT) unixutil$(PPUEXT) strings$(PPUEXT) $(UNIXINC)/unix.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \
                  unxconst.inc $(UNIXINC)/timezone.inc \

rtl/freebsd/Makefile

@@ -1983,8 +1983,8 @@ dateutils$(PPUEXT): $(OBJPASDIR)/dateutils.pp baseunix$(PPUEXT) $(SYSTEMUNIT)$(P
 strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
 		   $(PROCINC)/strings.inc $(PROCINC)/stringss.inc\
 		   $(SYSTEMUNIT)$(PPUEXT)
-unixtype$(PPUEXT): $(UNIXINC)/unixtype.pp $(BSDINC)/ctypes.inc ptypes.inc $(SYSTEMUNIT)$(PPUEXT)
-baseunix$(PPUEXT) : errno.inc ptypes.inc $(BSDINC)/ctypes.inc \
+unixtype$(PPUEXT): $(UNIXINC)/unixtype.pp $(UNIXINC)/ctypes.inc ptypes.inc $(SYSTEMUNIT)$(PPUEXT)
+baseunix$(PPUEXT) : errno.inc ptypes.inc $(UNIXINC)/ctypes.inc \
   signal.inc $(UNIXINC)/bunxh.inc \
   $(BSDINC)/bunxsysc.inc $(BSDPROCINC)/syscallh.inc sysnr.inc \
   $(BSDINC)/ostypes.inc $(BSDINC)/osmacro.inc $(UNIXINC)/gensigset.inc \

rtl/freebsd/Makefile.fpc

@@ -146,9 +146,9 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
 # System Dependent Units
 #
 
-unixtype$(PPUEXT): $(UNIXINC)/unixtype.pp $(BSDINC)/ctypes.inc ptypes.inc $(SYSTEMUNIT)$(PPUEXT)
+unixtype$(PPUEXT): $(UNIXINC)/unixtype.pp $(UNIXINC)/ctypes.inc ptypes.inc $(SYSTEMUNIT)$(PPUEXT)
 
-baseunix$(PPUEXT) : errno.inc ptypes.inc $(BSDINC)/ctypes.inc \
+baseunix$(PPUEXT) : errno.inc ptypes.inc $(UNIXINC)/ctypes.inc \
   signal.inc $(UNIXINC)/bunxh.inc \
   $(BSDINC)/bunxsysc.inc $(BSDPROCINC)/syscallh.inc sysnr.inc \
   $(BSDINC)/ostypes.inc $(BSDINC)/osmacro.inc $(UNIXINC)/gensigset.inc \

rtl/linux/Makefile

@@ -2193,8 +2193,8 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
 unix$(PPUEXT) : unix.pp strings$(PPUEXT) baseunix$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \
 		 unxconst.inc $(UNIXINC)/timezone.inc $(SYSTEMUNIT)$(PPUEXT) \
 		 unxfunc.inc
-unixtype$(PPUEXT) : $(UNIXINC)/unixtype.pp ptypes.inc ctypes.inc $(SYSTEMUNIT)$(PPUEXT)
-baseunix$(PPUEXT) : errno.inc ptypes.inc ctypes.inc \
+unixtype$(PPUEXT) : $(UNIXINC)/unixtype.pp ptypes.inc $(UNIXINC)/ctypes.inc $(SYSTEMUNIT)$(PPUEXT)
+baseunix$(PPUEXT) : errno.inc ptypes.inc $(UNIXINC)/ctypes.inc \
   $(UNIXINC)/bunxh.inc \
   bunxsysc.inc $(CPU_TARGET)/syscallh.inc $(CPU_TARGET)/sysnr.inc \
   ostypes.inc osmacro.inc $(UNIXINC)/gensigset.inc \

rtl/linux/Makefile.fpc

@@ -161,9 +161,9 @@ unix$(PPUEXT) : unix.pp strings$(PPUEXT) baseunix$(PPUEXT) $(INC)/textrec.inc $(
                  unxconst.inc $(UNIXINC)/timezone.inc $(SYSTEMUNIT)$(PPUEXT) \
                  unxfunc.inc
 
-unixtype$(PPUEXT) : $(UNIXINC)/unixtype.pp ptypes.inc ctypes.inc $(SYSTEMUNIT)$(PPUEXT)
+unixtype$(PPUEXT) : $(UNIXINC)/unixtype.pp ptypes.inc $(UNIXINC)/ctypes.inc $(SYSTEMUNIT)$(PPUEXT)
 
-baseunix$(PPUEXT) : errno.inc ptypes.inc ctypes.inc \
+baseunix$(PPUEXT) : errno.inc ptypes.inc $(UNIXINC)/ctypes.inc \
   $(UNIXINC)/bunxh.inc \
   bunxsysc.inc $(CPU_TARGET)/syscallh.inc $(CPU_TARGET)/sysnr.inc \
   ostypes.inc osmacro.inc $(UNIXINC)/gensigset.inc \

rtl/linux/ctypes.inc

@@ -1,102 +0,0 @@
-{
-    $Id$
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 2001 by Free Pascal development team
-
-    Basic types for C interfacing. Check the 64-bit defines.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{***********************************************************************}
-{                       POSIX TYPE DEFINITIONS                          }
-{***********************************************************************}
-
-Type
-    { the following type definitions are compiler dependant }
-    { and system dependant                                  }
-
-    cInt8  = shortint;
-    cUInt8 = byte;
-    cUInt16= word;
-    cInt16 = smallint;
-    cInt32 = longint;
-    cUInt32= cardinal;
-    cInt64 = int64;
-{$ifndef VER1_0}
-    cUInt64= qword;
-{$else}
-    cUInt64= int64;
-{$endif}
-
-    cuchar = byte;
-    cchar  = shortint;
-    cInt   = longint;           { minimum range is : 32-bit    }
-    cUInt  = Cardinal;          { minimum range is : 32-bit    }
-{$ifdef cpu64}
-    cLong  = int64;
-    cuLong = qword;
-{$else}
-    cLong  = longint;
-    cuLong = Cardinal;
-{$endif}
-    clonglong = int64;
-{$ifndef VER1_0}
-    culonglong = qword;
-{$else VER1_0}
-    culonglong = int64;
-{$endif VER1_0}
-    cshort   = smallint;
-    cushort  = word;
-
-    pcInt    = ^cInt;
-    pcUInt   = ^cUInt;
-    pcLong   = ^cLong;
-    pculong  = ^cuLong;
-    pcshort  = ^cshort;
-    pcushort = ^cushort;
-    pcchar   = ^cchar;
-    pcuchar  = ^cuchar;
-
-    cunsigned = cuint;
-    pcunsigned = ^cunsigned;
-
-{
-   $Log$
-   Revision 1.6  2005-02-05 23:02:37  florian
-     + added some missing c types
-
-   Revision 1.5  2004/09/09 20:29:06  jonas
-     * fixed definition of pthread_mutex_t for non-linux targets (and for
-       linux as well, actually).
-     * base libpthread definitions are now in ptypes.inc, included in unixtype
-       They sometimes have an extra underscore in front of their name, in
-       case they were also exported by the packages/base/pthreads unit, so
-       they can keep their original name there
-     * cthreadds unit now imports systuils, because it uses exceptions (it
-       already did so before as well)
-     * fixed many linux definitions of libpthread functions in pthrlinux.inc
-       (integer -> cint etc)
-     + added culonglong type to ctype.inc
-
-   Revision 1.4  2004/04/26 16:53:19  peter
-     * use cpu64
-
-   Revision 1.3  2003/09/16 21:20:40  marco
-    * pointer's of some basetypes
-
-   Revision 1.2  2002/12/18 16:43:26  marco
-    * new unix rtl, linux part.....
-
-   Revision 1.1  2002/11/09 22:39:28  marco
-    * first version
-
-
-}
-