Merged revisions 7046-7047 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
 r7046 | hajny | 2007-04-01 12:22:20 +0200 (Sun, 01 Apr 2007) | 1 line

   - removed duplicated type pointer definitions
........
 r7047 | hajny | 2007-04-01 12:25:20 +0200 (Sun, 01 Apr 2007) | 1 line

   * missing ctypes dependency for initc added
........

git-svn-id: branches/fixes_2_2@7139 -

rtl/netware/Makefile

@@ -2318,7 +2318,7 @@ netware$(PPUEXT) : netware.pp $(SYSTEMUNIT)$(PPUEXT)
 winsock$(PPUEXT) : winsock.pp $(SYSTEMUNIT)$(PPUEXT)
 sockets$(PPUEXT) : sockets.pp netware$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
 		   $(INC)/sockets.inc $(INC)/socketsh.inc
-initc$(PPUEXT) : initc.pp $(SYSTEMUNIT)$(PPUEXT)
+initc$(PPUEXT) : initc.pp ctypes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 dos$(PPUEXT) : dos.pp $(INC)/filerec.inc $(INC)/textrec.inc strings$(PPUEXT) nwserv$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 crt$(PPUEXT) : crt.pp $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) dos$(PPUEXT)
 objects$(PPUEXT) : $(INC)/objects.pp $(SYSTEMUNIT)$(PPUEXT)

rtl/netware/Makefile.fpc

@@ -138,7 +138,7 @@ sockets$(PPUEXT) : sockets.pp netware$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
 
 #dynlibs$(PPUEXT) : $(INC)/dynlibs.pas windows$(PPUEXT)
 
-initc$(PPUEXT) : initc.pp $(SYSTEMUNIT)$(PPUEXT)
+initc$(PPUEXT) : initc.pp ctypes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 
 
 #

rtl/netwlibc/Makefile

@@ -2318,7 +2318,7 @@ nwsnut$(PPUEXT) : nwsnut.pp ../netware/nwsnut.pp libc$(PPUEXT) $(SYSTEMUNIT)$(PP
 sockets$(PPUEXT) : sockets.pp winsock$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
 		   $(INC)/sockets.inc $(INC)/socketsh.inc
 dynlibs$(PPUEXT) : $(INC)/dynlibs.pas libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
-initc$(PPUEXT) : initc.pp libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
+initc$(PPUEXT) : initc.pp ctypes$(PPUEXT) libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 dos$(PPUEXT) : dos.pp libc.pp $(INC)/filerec.inc $(INC)/textrec.inc strings$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 crt$(PPUEXT) : crt.pp libc.pp $(INC)/textrec.inc $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) dos$(PPUEXT)
 objects$(PPUEXT) : $(INC)/objects.pp $(SYSTEMUNIT)$(PPUEXT)

rtl/netwlibc/Makefile.fpc

@@ -148,7 +148,7 @@ sockets$(PPUEXT) : sockets.pp winsock$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
 
 dynlibs$(PPUEXT) : $(INC)/dynlibs.pas libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 
-initc$(PPUEXT) : initc.pp libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
+initc$(PPUEXT) : initc.pp ctypes$(PPUEXT) libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 
 
 #

rtl/netwlibc/libc.pp

@@ -18,6 +18,7 @@
 unit libc;
 interface
 
+
 { Netware libc interface
   Translated from c ndk Armin Diehl 2004/09/02 }
 {$endif}
@@ -28,14 +29,14 @@ const
 
 { Pointers to basic pascal types, inserted by h2pas conversion program.}
 Type
-{$ifndef INCLUDED_FROM_SYSTEM}
+{ $ifndef INCLUDED_FROM_SYSTEM - (always available in 2.0.x and above - TH)
   PLongint  = ^Longint;
   PSmallInt = ^SmallInt;
   PByte     = ^Byte;
   PWord     = ^Word;
   PDWord    = ^DWord;
   PDouble   = ^Double;
-{$endif}
+$endif}
   PPPChar   = ^PPChar;
   void      = pointer;
   cint      = longint;