--- Merging r16503 into '.':

C    packages/fcl-net/Makefile.fpc
U    packages/fcl-net/src/cnetdb.pp
C    packages/fcl-net/Makefile
Skipped 'packages/fcl-net/examples/cnslookup.pp'
Summary of conflicts:
  Text conflicts: 2
  Skipped paths: 1

# revisions: 16503
------------------------------------------------------------------------
r16503 | marco | 2010-12-04 18:18:05 +0100 (Sat, 04 Dec 2010) | 2 lines
Changed paths:
   M /trunk/packages/fcl-net/Makefile
   M /trunk/packages/fcl-net/Makefile.fpc
   A /trunk/packages/fcl-net/examples/cnslookup.pp
   M /trunk/packages/fcl-net/src/cnetdb.pp

 * enabled cnetdb for Linux, added a demo

------------------------------------------------------------------------

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

packages/fcl-net/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/08/25]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/23]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -345,7 +345,7 @@ ifeq ($(FULL_TARGET),mipsel-linux)
 override TARGET_PROGRAMS+=mkxmlrpc
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc cnetdb
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 override TARGET_UNITS+=servlets
@@ -405,7 +405,7 @@ ifeq ($(FULL_TARGET),i386-symbian)
 override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc cnetdb
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc cnetdb
@@ -429,7 +429,7 @@ ifeq ($(FULL_TARGET),m68k-embedded)
 override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc cnetdb
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
@@ -450,7 +450,7 @@ ifeq ($(FULL_TARGET),powerpc-embedded)
 override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc cnetdb
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
@@ -462,7 +462,7 @@ ifeq ($(FULL_TARGET),sparc-embedded)
 override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc cnetdb
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc cnetdb
@@ -480,7 +480,7 @@ ifeq ($(FULL_TARGET),x86_64-embedded)
 override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc cnetdb
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_UNITS+=servlets
@@ -504,7 +504,7 @@ ifeq ($(FULL_TARGET),arm-symbian)
 override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc cnetdb
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 override TARGET_UNITS+=servlets  netdb resolve ssockets
@@ -516,13 +516,13 @@ ifeq ($(FULL_TARGET),avr-embedded)
 override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc cnetdb
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
 override TARGET_UNITS+=servlets
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+override TARGET_UNITS+=servlets  netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc cnetdb
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_RSTS+=fpsock httpsvlt mkxmlrpc

packages/fcl-net/Makefile.fpc

@@ -8,7 +8,7 @@ version=2.4.3
 
 [target]
 units=servlets
-units_linux=netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
+units_linux=netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc cnetdb
 units_freebsd=netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc cnetdb
 units_netbsd=netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc
 units_openbsd=netdb resolve ssockets fpsock httpbase httpclient httpsvlt xmlrpc

packages/fcl-net/src/cnetdb.pp

@@ -157,6 +157,7 @@ type
     h_length: cInt;     {* length of address *}
     h_addr_list: PPChar;{* list of addresses from name server *}
   end;
+
   THostEnt = hostent;
   PHostEnt = ^THostEnt;
   PPHostEnt = ^PHostEnt;