>Number:         6282
>Category:       xsrc
>Synopsis:       xsrc need some patch for NetBSD-current
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    gnats-admin (GNATS administrator)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Oct 12 14:35:00 1998
>Last-Modified:
>Originator:     Matthieu Herrb
>Organization:
	LAAS/CNRS Toulouse
>Release:        NetBSD-current 1998/10/01
>Environment:
System: NetBSD cougar 1.3H NetBSD 1.3H (COUGAR) #11: Fri Oct 2 23:14:36 CEST 1998 matthieu@cougar:/sys/arch/i386/compile/COUGAR i386


>Description:

This is a small patch to build xsrc under NetBSD-current:
- NetBSD doesn't define 'unix' in the C preprocessor, but it emits a
  warning if the unix symbol is tested. This avoids the warning in
  imake 
- with recent signal changes, sigset_t is not an integral type
  anymore, so it can't be casted to an int for printf().


>How-To-Repeat:
	Try to build xsrc under -current
>Fix:
Index: xc/config/imake/imakemdep.h
===================================================================
RCS file: /cvs/xc/config/imake/imakemdep.h,v
retrieving revision 3.24.2.4
diff -u -r3.24.2.4 imakemdep.h
--- imakemdep.h	1998/10/04 13:36:16	3.24.2.4
+++ imakemdep.h	1998/10/12 21:09:19
@@ -291,8 +291,10 @@
 char *cpp_argv[ARGUMENTS] = {
 	"cc",		/* replaced by the actual program to exec */
 	"-I.",		/* add current directory to include path */
+#if !defined(__NetBSD_Version__) || __NetBSD_Version__ < 103080000
 #ifdef unix
 	"-Uunix",	/* remove unix symbol so that filename unix.c okay */
+#endif
 #endif
 #if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH)
 # ifdef __i386__
Index: xc/programs/xdm/dm.c
===================================================================
RCS file: /cvs/xc/programs/xdm/dm.c,v
retrieving revision 3.4
diff -u -r3.4 dm.c
--- dm.c	1996/10/06 13:18:56	3.4
+++ dm.c	1998/10/12 21:09:59
@@ -408,7 +408,12 @@
 #else
     omask = sigblock (sigmask (SIGCHLD) | sigmask (SIGHUP));
 #endif
+#if !defined(__NetBSD_Version__) || __NetBSD_Version__ < 103080000
     Debug ("signals blocked, mask was 0x%x\n", omask);
+#else
+    /* sigset_t is no longer an integral type on NetBSD 1.3H */
+    Debug ("signals blocked\n");
+#endif
     if (!ChildReady && !Rescan)
 #ifndef X_NOT_POSIX
 	sigsuspend(&omask);


>Audit-Trail:
>Unformatted: