[PATCH] build fixes for alphaev67-dec-osf5.1 and i386-unknown-freebsd4.7

[Simon Josefsson]

source='obstack.c' object='obstack.o' libtool=no  depfile='.deps/obstack.Po' 
tmpdepfile='.deps/obstack.TPo'  depmode=tru64 /bin/ksh ../depcomp  cc 
-DHAVE_CONFIG_H -I. -I. -I.. -DPATH_WTMPX=\"/tmp/jas/var/log/wtmpx\"    
-I../include   -I/include  -g -c `test -f 'obstack.c' || echo './'`obstack.c
cc: Error: obstack.c, line 109: In the definition of the function 
"_obstack_begin", the promoted type of chunkfun is incompatible with the type 
of the corresponding parameter in a prior declaration. (promotmatch)
     POINTER (*chunkfun) ();
-----^

Index: obstack.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/libinetutils/obstack.c,v
retrieving revision 1.1
diff -u -p -u -w -r1.1 obstack.c
--- obstack.c   4 Apr 2002 23:56:24 -0000       1.1
+++ obstack.c   6 Dec 2002 09:41:02 -0000
@@ -43,11 +43,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 
 #ifndef ELIDE_CODE
 
 
-#if defined (__STDC__) && __STDC__
 #define POINTER void *
-#else
-#define POINTER char *
-#endif
 
 /* Determine default alignment.  */
 struct fooalign {char x; double d;};

source='utmp_init.c' object='utmp_init.o' libtool=no  
depfile='.deps/utmp_init.Po' tmpdepfile='.deps/utmp_init.TPo'  depmode=gcc 
/bin/bash ../depcomp  gcc -DHAVE_CONFIG_H -I. -I. -I..     -I../include   
-I/include  -g -c `test -f 'utmp_init.c' || echo './'`utmp_init.c
utmp_init.c: In function `utmp_init':
utmp_init.c:72: structure has no member named `ut_tv'
*** Error code 1

Index: utmp_init.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/libinetutils/utmp_init.c,v
retrieving revision 1.8
diff -u -p -u -w -r1.8 utmp_init.c
--- utmp_init.c 14 May 2002 15:15:05 -0000      1.8
+++ utmp_init.c 6 Dec 2002 09:40:48 -0000
@@ -53,22 +53,27 @@ utmp_init(char   *line, char   *user, ch
 #endif
 
     memset((char *) &utx, 0, sizeof(utx));
-#if defined(HAVE_STRUCT_UTMP_UT_ID)
+#if (defined(UTMPX) && defined(HAVE_STRUCT_UTMPX_UT_ID)) ||
+    (!defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_ID))
     strncpy(utx.ut_id, id, sizeof(utx.ut_id));
 #endif
-#if defined(HAVE_STRUCT_UTMP_UT_USER)
+#if (defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_USER)) ||
+    (!defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_USER))
     strncpy(utx.ut_user, user, sizeof(utx.ut_user));
 #else
     strncpy(utx.ut_name, user, sizeof(utx.ut_name));
 #endif
     strncpy(utx.ut_line, line, sizeof(utx.ut_line));
-#if defined(HAVE_STRUCT_UTMP_UT_PID)
+#if (defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_PID)) ||
+    (!defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_PID))
     utx.ut_pid = getpid();
 #endif
-#if defined(HAVE_STRUCT_UTMP_UT_TYPE)
+#if (defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_TYPE)) ||
+    (!defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_TYPE))
     utx.ut_type = LOGIN_PROCESS;
 #endif
-#if defined(HAVE_STRUCT_UTMPX_UT_TV)
+#if (defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_TV)) ||
+    (!defined(UTMPX) && defined(HAVE_STRUCT_UTMP_UT_TV))
     gettimeofday(&(utx.ut_tv), 0);
 #else
     time(&(utx.ut_time));