From 01b7a3fcc1b2473e368d05eeb16d627b48bcd0f4 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Fri, 6 Apr 2007 00:33:52 +0000
Subject: [PATCH] 2007-04-06 02:32 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/common.mak   *
 harbour/source/lang/Makefile   + harbour/source/lang/msgnl.c     + added
 Dutch language module by Rene Koot

  * harbour/config/os2/gcc.cf
    * commented out -DTCPV40HDRS in CFLAGS
  * harbour/make_gnu.cmd
    * added commented by default: set C_USR=-DTCPV40HDRS %C_USR%

  * harbour/contrib/libnf/menu1.prg
  * harbour/contrib/libnf/pegs.prg
  * harbour/contrib/libnf/popadder.prg
  * harbour/contrib/libnf/savesets.prg
  * harbour/source/debug/dbgmenu.prg
    + added missing #include "common.ch" for HB_SYMBOL_UNUSED()

  * harbour/include/hbclass.ch
    * renamed __HB_SYMBOL_UNUSED() to __HB_CLS_SYMBOL_UNUSED() to keep
      the same name convention as for other hbclass definitions/commands

  * harbour/include/hbsetup.h
    * added commented by default #define HB_PP_MULTILINE_STRING
      with small description

  * harbour/source/rtl/net.c
    * added missing #include(s) for OS2 build

  * harbour/source/rdd/dbfcdx/dbfcdx1.c
    * formatting
---
 harbour/ChangeLog                   |  32 ++++
 harbour/common.mak                  |   1 +
 harbour/config/os2/gcc.cf           |   3 +-
 harbour/contrib/libnf/menu1.prg     |   2 +-
 harbour/contrib/libnf/pegs.prg      |   2 +
 harbour/contrib/libnf/popadder.prg  |   1 +
 harbour/contrib/libnf/savesets.prg  |   1 +
 harbour/include/hbclass.ch          |  14 +-
 harbour/include/hbsetup.h           |  12 ++
 harbour/make_gnu.cmd                |   3 +
 harbour/source/debug/dbgmenu.prg    |   1 +
 harbour/source/lang/Makefile        |   1 +
 harbour/source/lang/msgnl.c         | 220 ++++++++++++++++++++++++++++
 harbour/source/rdd/dbfcdx/dbfcdx1.c |   2 +-
 harbour/source/rtl/net.c            |   3 +
 15 files changed, 288 insertions(+), 10 deletions(-)
 create mode 100644 harbour/source/lang/msgnl.c

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bc5d6bfa09..6d488fe763 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,38 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-04-06 02:32 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/common.mak
+  * harbour/source/lang/Makefile
+  + harbour/source/lang/msgnl.c
+    + added Dutch language module by Rene Koot
+
+  * harbour/config/os2/gcc.cf
+    * commented out -DTCPV40HDRS in CFLAGS
+  * harbour/make_gnu.cmd
+    * added commented by default: set C_USR=-DTCPV40HDRS %C_USR%
+
+  * harbour/contrib/libnf/menu1.prg
+  * harbour/contrib/libnf/pegs.prg
+  * harbour/contrib/libnf/popadder.prg
+  * harbour/contrib/libnf/savesets.prg
+  * harbour/source/debug/dbgmenu.prg
+    + added missing #include "common.ch" for HB_SYMBOL_UNUSED()
+
+  * harbour/include/hbclass.ch
+    * renamed __HB_SYMBOL_UNUSED() to __HB_CLS_SYMBOL_UNUSED() to keep
+      the same name convention as for other hbclass definitions/commands
+
+  * harbour/include/hbsetup.h
+    * added commented by default #define HB_PP_MULTILINE_STRING
+      with small description
+
+  * harbour/source/rtl/net.c
+    * added missing #include(s) for OS2 build
+
+  * harbour/source/rdd/dbfcdx/dbfcdx1.c
+    * formatting
+
 2007-04-05 13:31 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * harbour/include/hbclass.ch
    * harbour/include/common.ch
diff --git a/harbour/common.mak b/harbour/common.mak
index 828d1b4210..a393947baa 100644
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -577,6 +577,7 @@ LANG_LIB_OBJS = \
     $(OBJ_DIR)\msgis850.obj \
     $(OBJ_DIR)\msgit.obj    \
     $(OBJ_DIR)\msgko.obj    \
+    $(OBJ_DIR)\msgnl.obj    \
     $(OBJ_DIR)\msgpl852.obj \
     $(OBJ_DIR)\msgpliso.obj \
     $(OBJ_DIR)\msgplmaz.obj \
diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf
index cc3d728936..7eaabf07e5 100644
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -18,7 +18,8 @@ CFLAGS = -W -Wall -DHB_OS_OS2 -O2
 # 26/03/2004 - <maurilio.longo@libero.it>
 # added -DTCPV40HDRS to compile with GCC 3.2.2 on OS/2 v4.0 with mixed 16/32 bit tcp/ip stack
 # to be removed if compiled on a tcp/ip stack >= 4.1 (eComStation, for example)
-CFLAGS += -DTCPV40HDRS
+# disabled, if you need it please use: C_USR=-DTCPV40HDRS
+# CFLAGS += -DTCPV40HDRS
 
 LD = gcc
 LDFLAGS =
diff --git a/harbour/contrib/libnf/menu1.prg b/harbour/contrib/libnf/menu1.prg
index 3cf235078b..4279f979f6 100644
--- a/harbour/contrib/libnf/menu1.prg
+++ b/harbour/contrib/libnf/menu1.prg
@@ -149,7 +149,7 @@
  */
 
 
-
+#include "common.ch"
 
 #define LEFTARROW  19
 #define RIGHTARROW  4
diff --git a/harbour/contrib/libnf/pegs.prg b/harbour/contrib/libnf/pegs.prg
index 830b5eeab5..d73a77de88 100644
--- a/harbour/contrib/libnf/pegs.prg
+++ b/harbour/contrib/libnf/pegs.prg
@@ -48,6 +48,8 @@
  */
 
 #include "inkey.ch"
+#include "common.ch"
+
 #translate SINGLEBOX(<top>, <left>, <bottom>, <right>) => ;
            @ <top>, <left>, <bottom>, <right> BOX "ÚÄ¿³ÙÄÀ³ "
 #translate DOUBLEBOX(<top>, <left>, <bottom>, <right>) => ;
diff --git a/harbour/contrib/libnf/popadder.prg b/harbour/contrib/libnf/popadder.prg
index ac780706b9..92e0768ea7 100644
--- a/harbour/contrib/libnf/popadder.prg
+++ b/harbour/contrib/libnf/popadder.prg
@@ -110,6 +110,7 @@
 #include 'inkey.ch'
 #include 'setcurs.ch'
 #include 'achoice.ch'
+#include 'common.ch'
 
 // Set up manifest constants to access the window colors in the array aWinColor
 #define W_BORDER 1
diff --git a/harbour/contrib/libnf/savesets.prg b/harbour/contrib/libnf/savesets.prg
index 03e6133a99..cb1798ebcf 100644
--- a/harbour/contrib/libnf/savesets.prg
+++ b/harbour/contrib/libnf/savesets.prg
@@ -53,6 +53,7 @@
 
 
 #include "set.ch"
+#include "common.ch"
 
 #Define FT_EXTRA_SETS    2
 #DEFINE FT_SET_CENTURY   _SET_COUNT + 1
diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch
index bb22f80e99..43b38848bd 100644
--- a/harbour/include/hbclass.ch
+++ b/harbour/include/hbclass.ch
@@ -134,9 +134,6 @@
    #endif
 #endif
 
-/* Please keep it synced with the similar #define in common.ch */
-#define __HB_SYMBOL_UNUSED( symbol )  ( symbol := ( symbol ) )
-
 /*
  * I have to enable this definition by default untill we will not fix
  * preprocessor. [druzus]
@@ -187,6 +184,9 @@
    #xtranslate __HB_CLS_ERR([<msg,...>]) => ;#error [ <msg>] ; #line
 #endif
 
+/* Please keep it synced with the similar #define in common.ch */
+#define __HB_CLS_SYMBOL_UNUSED( symbol )  ( symbol := ( symbol ) )
+
 #xtranslate __HB_CLS_VARERR(<var>) => __HB_CLS_ERR( Invalid instance variable name: <var> )
 
 DECLARE HBClass ;
@@ -324,7 +324,7 @@ DECLARE HBClass ;
 
 /* Operator overloading */
 #xcommand OPERATOR <op> [<arg: ARG, ARGS> <Args,...>] [LOCAL <Locals,...>] INLINE <Code,...> [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
-   s_oClass:AddInline( <(op)>, {|Self [,<Args>] [,<Locals>]| <Code>}, __HB_SYMBOL_UNUSED(Self), __HB_CLS_SCOPE( <.export.>, <.protect.>, <.hidde.> ) )
+   s_oClass:AddInline( <(op)>, {|Self [,<Args>] [,<Locals>]| <Code>}, __HB_CLS_SYMBOL_UNUSED(Self), __HB_CLS_SCOPE( <.export.>, <.protect.>, <.hidde.> ) )
 
 #xcommand METHOD <MethodName> [ AS <type> ] OPERATOR <op> [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
    _HB_MEMBER __HB_CLS_ASFUNC(<MethodName>) [ AS <type> ];;
@@ -363,7 +363,7 @@ DECLARE HBClass ;
    s_oClass:AddInline( __HB_CLS_ASSTRING(<MessageName>), <CodeBlock>, __HB_CLS_SCOPE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) + iif( <.persistent.>, HB_OO_CLSTP_PERSIST, 0 ) )
 
 #xcommand MESSAGE <MessageName> [ AS <type> ] [LOCAL <Locals,...>] INLINE <Code,...> [<ctor: CONSTRUCTOR>] [<export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] [<persistent: PERSISTENT, PROPERTY>] => ;
-   MESSAGE <MessageName> [ AS <type> ] BLOCK {|Self __HB_CLS_ASARGSOPT(<MessageName>) [,<Locals>]| __HB_SYMBOL_UNUSED(Self), <Code>} <ctor> <export> <protect> <hidde> <persistent>
+   MESSAGE <MessageName> [ AS <type> ] BLOCK {|Self __HB_CLS_ASARGSOPT(<MessageName>) [,<Locals>]| __HB_CLS_SYMBOL_UNUSED(Self), <Code>} <ctor> <export> <protect> <hidde> <persistent>
 
 #xcommand MESSAGE <MessageName> [ AS <type> ] <arg: ARG, ARGS> <Args,...> [LOCAL <Locals,...>] INLINE <Code,...> [<ctor: CONSTRUCTOR>] [<export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] [<persistent: PERSISTENT, PROPERTY>] => ;
    MESSAGE __HB_CLS_ASID(<MessageName>)([<Args>]) [ AS <type> ] [LOCAL <Locals>] INLINE <Code> <ctor> <export> <protect> <hidde> <persistent>
@@ -442,10 +442,10 @@ DECLARE HBClass ;
 
    // Classy compatibility... Added By JF Lefebvre (mafact) 2006/11/07
    #xcommand METHOD <MethodName> [ AS <type> ] INLINE [Local <v>,] <Code,...> [<other>] => ;
-             MESSAGE <MethodName> [ AS <type> ] BLOCK {|Self [,<v>] | __HB_SYMBOL_UNUSED(Self), <Code> } [<other>]
+             MESSAGE <MethodName> [ AS <type> ] BLOCK {|Self [,<v>] | __HB_CLS_SYMBOL_UNUSED(Self), <Code> } [<other>]
 
    #xcommand METHOD <MethodName>( [<params,...>] ) [ AS <type> ] INLINE [Local <v>,] <Code,...> [<other>] => ;
-             MESSAGE <MethodName> [ AS <type> ] BLOCK {|Self [,<params>] [,<v>] | __HB_SYMBOL_UNUSED(Self), <Code> } [<other>]
+             MESSAGE <MethodName> [ AS <type> ] BLOCK {|Self [,<params>] [,<v>] | __HB_CLS_SYMBOL_UNUSED(Self), <Code> } [<other>]
 
 
    /* This definitions are not Class(y) compatible - I'm leaving them as is now */
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index ad630d1e20..71397c57ea 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -193,6 +193,18 @@
 */
 #endif
 
+/* ***********************************************************************
+ * You can  enable here support for multiline strings concatenated by ';'
+ * f.e.:
+ *       cVar := "line 1;
+ *       line 2;
+ *       line 3"
+ * It's not Clipper compatible extension and it's not enabled by default
+ * anyhow old Harbour PP worked in such way and people may have some code
+ * which needs it
+*/
+/* #define HB_PP_MULTILINE_STRING */
+
 /* ***********************************************************************
  * You can select here, if the preprocessor should be linked
  * for commands preprocessing passed to the macro compiler.
diff --git a/harbour/make_gnu.cmd b/harbour/make_gnu.cmd
index c8cd88d814..a2e85f2928 100644
--- a/harbour/make_gnu.cmd
+++ b/harbour/make_gnu.cmd
@@ -22,6 +22,9 @@ rem set PRG_USR=
 rem set C_USR= 
 rem set L_USR=
 
+rem Uncomment for GCC 3.2.2 on OS/2 v4.0 with mixed 16/32 bit tcp/ip stack
+rem set C_USR=-DTCPV40HDRS %C_USR%
+
 rem Set to constant value to be consistent with the non-GNU make files.
 
 if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=bin\
diff --git a/harbour/source/debug/dbgmenu.prg b/harbour/source/debug/dbgmenu.prg
index c8949244cd..dddd0b77f0 100644
--- a/harbour/source/debug/dbgmenu.prg
+++ b/harbour/source/debug/dbgmenu.prg
@@ -51,6 +51,7 @@
  */
 
 #include "hbclass.ch"
+#include "common.ch"
 
 #xcommand MENU [<oMenu>] => [ <oMenu> := ] TDbMenu():New()
 #xcommand MENUITEM [ <oMenuItem> PROMPT ] <cPrompt> ;
diff --git a/harbour/source/lang/Makefile b/harbour/source/lang/Makefile
index a8ef4ca885..5f7fb76876 100644
--- a/harbour/source/lang/Makefile
+++ b/harbour/source/lang/Makefile
@@ -35,6 +35,7 @@ C_SOURCES=\
 	msgis850.c   \
 	msgit.c      \
 	msgko.c      \
+	msgnl.c      \
 	msgpl852.c   \
 	msgpliso.c   \
 	msgplmaz.c   \
diff --git a/harbour/source/lang/msgnl.c b/harbour/source/lang/msgnl.c
new file mode 100644
index 0000000000..352f70ec8f
--- /dev/null
+++ b/harbour/source/lang/msgnl.c
@@ -0,0 +1,220 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * Language Support Module (NL)
+ *
+ * Copyright 2007 Rene Koot <rene / at / plantenkennis.com>
+ * www - http://www.harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * 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.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
+ *
+ * As a special exception, the Harbour Project gives permission for
+ * additional uses of the text contained in its release of Harbour.
+ *
+ * The exception is that, if you link the Harbour libraries with other
+ * files to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the Harbour library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the Harbour
+ * Project under the name Harbour.  If you copy code from other
+ * Harbour Project or Free Software Foundation releases into a copy of
+ * Harbour, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for Harbour, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ *
+ */
+
+/* Language name: Dutch */
+/* ISO language code (2 chars): NL */
+/* Codepage: 437 */
+
+#include "hbapilng.h"
+
+static HB_LANG s_lang =
+{
+   {
+      /* Identification */
+
+      "NL",             /* ID */
+      "Dutch",          /* Name (in English) */
+      "Nederlands",     /* Name (in native language) */
+      "NL",             /* RFC ID */
+      "437",            /* Codepage */
+      "$Revision$", 	/* Version */
+
+      /* Month names */
+
+      "Januari",
+      "Februari",
+      "Maart",
+      "April",
+      "Mei",
+      "Juni",
+      "Juli",
+      "Augustus",
+      "September",
+      "Oktober",
+      "November",
+      "December",
+
+      /* Day names */
+
+      "Zondag",
+      "Maandag",
+      "Dinsdag",
+      "Woensdag",
+      "Donderdag",
+      "Vrijdag",
+      "Zaterdag",
+
+      /* CA-Cl*pper compatible natmsg items */
+
+      "Gegevens Bestanden # Regels Laatste Aanpassing Grootte",
+      "Wilt u meer voorbeelden?",
+      "Pagina Nr.",
+      "** Subtotaal **",
+      "* Subsubtotaal *",
+      "*** Totaal ***",
+      "Ins",
+      " ",
+      "Ongeldige datum",
+      "Bereik: ",
+      " - ",
+      "J/N",
+      "ONGELDIGE EXPRESSIE",
+
+      /* Error description names */
+
+      "Onbekende fout",
+      "Argument fout",
+      "Begrenzings fout",
+      "Tekst overloop",
+      "Numerieke overloop",
+      "Deling door nul",
+      "Numerieke fout",
+      "Syntax fout",
+      "Handeling te ingewikkeld",
+      "",
+      "",
+      "Weinig geheugen",
+      "Niet gedefinieerde functie",
+      "Geen geëxporteerde methode",
+      "Variabele bestaat niet",
+      "Alias bestaat niet",
+      "Geen geëxporteerde variabele",
+      "Ongeldige karakters in alias",
+      "Alias reeds in gebruik",
+      "",
+      "Maak fout",
+      "Open fout",
+      "Sluit fout",
+      "Lees fout",
+      "Schrijf fout",
+      "Print fout",
+      "",
+      "",
+      "",
+      "",
+      "Handeling niet ondersteund",
+      "Limiet overschreden",
+      "Corruptie ontdekt",
+      "Data type fout",
+      "Data lengte fout",
+      "Werkgebied niet in gebruik",
+      "Werkgebied niet geïndexeerd",
+      "Exclusieve rechten vereist",
+      "Blokkering vereist",
+      "Schrijven niet toegestaan",
+      "Toevoegen blokkering mislukt",
+      "Blokkering mislukt",
+      "",
+      "",
+      "",
+      "",
+      "array toegang",
+      "array toewijzing",
+      "array afmeting",
+      "geen array",
+      "voorwaardelijk",
+
+      /* Internal error names */
+
+      "Onherstelbare fout %lu: ",
+      "Fout herstellen mislukt",
+      "Geen ERRORBLOCK() voor fout",
+      "Teveel herhalende fout behandelings aanroepen",
+      "RDD ongeldig of niet geladen",
+      "Ongeldige methode type van %s",
+      "hb_xgrab kan het geheugen niet toewijzen",
+      "hb_xrealloc aangeroepen met een lege aanwijzer",
+      "hb_xrealloc aangeroepen met een ongeldige aanwijzer",
+      "hb_xrealloc kan het geheugen niet opnieuw toewijzen",
+      "hb_xfree aangeroepen met een ongeldige aanwijzer",
+      "hb_xfree aangeroepen met een lege aanwijzer",
+      "Kan de startende procedure niet vinden: \'%s\'",
+      "Geen startende procedure",
+      "Niet ondersteunde VM opcode",
+      "Symbool onderdeel verondersteld van %s",
+      "Ongeldig symbool type voor zichzelf van %s",
+      "Codeblock verondersteld van %s",
+      "Ongeldig onderdeel type op de stapel probeert over te springen van %s",
+      "stapel te klein",
+      "Een onderdeel zou worden gekopieerd in zichzelf van %s",
+      "Ongeldig symbool onderdeel doorgegeven als memvar %s",
+      "Geheugen buffer stroomt over",
+      "hb_xgrab verzocht nul bytes toe te wijzen",
+      "hb_xrealloc verzocht om naar nul bytes te verkleinen",
+      "hb_xalloc verzocht nul bytes toe te wijzen",
+
+      /* Texts */
+
+      "JJJJ/MM/DD",
+      "J",
+      "N"
+   }
+};
+
+HB_LANG_ANNOUNCE( NL );
+
+HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_NL )
+   hb_langRegister( &s_lang );
+HB_CALL_ON_STARTUP_END( hb_lang_Init_NL )
+
+#if defined(HB_PRAGMA_STARTUP)
+   #pragma startup hb_lang_Init_NL
+#elif defined(HB_MSC_STARTUP)
+   #if _MSC_VER >= 1010
+      #pragma data_seg( ".CRT$XIY" )
+      #pragma comment( linker, "/Merge:.CRT=.data" )
+   #else
+      #pragma data_seg( "XIY" )
+   #endif
+   static HB_$INITSYM hb_vm_auto_hb_lang_Init_NL = hb_lang_Init_NL;
+   #pragma data_seg()
+#endif
diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c
index d0ffd9e091..35f2bd3b23 100644
--- a/harbour/source/rdd/dbfcdx/dbfcdx1.c
+++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c
@@ -4948,7 +4948,7 @@ static LPCDXINDEX hb_cdxFindBag( CDXAREAP pArea, char * szBagName )
    if ( szBasePath )
       hb_xfree( szBasePath );
    if ( szBaseExt )
-       hb_xfree( szBaseExt );
+      hb_xfree( szBaseExt );
    return pIndex;
 }
 
diff --git a/harbour/source/rtl/net.c b/harbour/source/rtl/net.c
index f71cc02825..d30e0acf37 100644
--- a/harbour/source/rtl/net.c
+++ b/harbour/source/rtl/net.c
@@ -72,6 +72,9 @@
    /* 25/03/2004 - <maurilio.longo@libero.it>
       not needed anymore as of GCC 3.2.2 */
 
+   #include <pwd.h>
+   #include <sys/types.h>
+
    #if defined(__EMX__) && __GNUC__ * 1000 + __GNUC_MINOR__ < 3002
       #include <emx/syscalls.h>
       #define gethostname __gethostname