Attachment #2279 for bug #2085




*-*-nto-qnx*)
	AC_DEFINE([USE_PIPES])
	AC_DEFINE([NO_X11_UNIX_SOCKETS])
	AC_DEFINE([MISSING_NFDBITS], [1], [Define on *nto-qnx systems])
	AC_DEFINE([MISSING_HOWMANY], [1], [Define on *nto-qnx systems])
	AC_DEFINE([MISSING_FD_MASK], [1], [Define on *nto-qnx systems])
	AC_DEFINE([DISABLE_LASTLOG])
	AC_DEFINE([SSHD_ACQUIRES_CTTY])
	AC_DEFINE([BROKEN_SHADOW_EXPIRE], [1], [QNX shadow support is broken])


*-*-lynxos)
        CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
	AC_DEFINE([MISSING_HOWMANY])
        AC_DEFINE([BROKEN_SETVBUF], [1], [LynxOS has broken setvbuf() implementation])
        ;;
esac

#include <stddef.h>
	])

# extra bits for select(2)
AC_CHECK_DECLS([howmany, NFDBITS], [], [], [[
#include <sys/param.h>
#include <sys/types.h>
#ifdef HAVE_SYS_SYSMACROS_H
#include <sys/sysmacros.h>
#endif
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
	]])
AC_CHECK_TYPES([fd_mask], [], [], [[
#include <sys/param.h>
#include <sys/types.h>
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
	]])

AC_CHECK_FUNCS([setresuid], [
	dnl Some platorms have setresuid that isn't implemented, test for this
	AC_MSG_CHECKING([if setresuid seems to work])




# define MAP_FAILED ((void *)-1)
#endif

/* *-*-nto-qnx doesn't define this constant in the system headers */
#ifdef MISSING_NFDBITS
# define	NFDBITS (8 * sizeof(unsigned long))
#endif

/*
SCO Open Server 3 has INADDR_LOOPBACK defined in rpc/rpc.h but
including rpc/rpc.h breaks Solaris 6

};
#endif

/* bits needed for select that may not be in the system headers */
#ifndef HAVE_FD_MASK
 typedef unsigned long int	fd_mask;
#endif

#if defined(HAVE_DECL_NFDBITS) && HAVE_DECL_NFDBITS == 0
# define	NFDBITS (8 * sizeof(unsigned long))
#endif

#if defined(HAVE_DECL_HOWMANY) && HAVE_DECL_HOWMANY == 0
# define howmany(x,y)	(((x)+((y)-1))/(y))
#endif

/* Paths */

#ifndef _PATH_BSHELL

# define __nonnull__(x)
#endif

/* *-*-nto-qnx doesn't define this macro in the system headers */
#ifdef MISSING_HOWMANY
# define howmany(x,y)	(((x)+((y)-1))/(y))
#endif

#ifndef OSSH_ALIGNBYTES
#define OSSH_ALIGNBYTES	(sizeof(int) - 1)
#endif

Return to bug 2085

Lines 979-987 Link Here

(-)configure.ac.old (-4 / +31 lines)
979	--nto-qnx*)	979	--nto-qnx*)
980	AC_DEFINE([USE_PIPES])	980	AC_DEFINE([USE_PIPES])
981	AC_DEFINE([NO_X11_UNIX_SOCKETS])	981	AC_DEFINE([NO_X11_UNIX_SOCKETS])
982	AC_DEFINE([MISSING_NFDBITS], [1], [Define on *nto-qnx systems])
983	AC_DEFINE([MISSING_HOWMANY], [1], [Define on *nto-qnx systems])
984	AC_DEFINE([MISSING_FD_MASK], [1], [Define on *nto-qnx systems])
985	AC_DEFINE([DISABLE_LASTLOG])	982	AC_DEFINE([DISABLE_LASTLOG])
986	AC_DEFINE([SSHD_ACQUIRES_CTTY])	983	AC_DEFINE([SSHD_ACQUIRES_CTTY])
987	AC_DEFINE([BROKEN_SHADOW_EXPIRE], [1], [QNX shadow support is broken])	984	AC_DEFINE([BROKEN_SHADOW_EXPIRE], [1], [QNX shadow support is broken])
Lines 1002-1008 Link Here
1002		999
1003	--lynxos)	1000	--lynxos)
1004	CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"	1001	CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
1005	AC_DEFINE([MISSING_HOWMANY])
1006	AC_DEFINE([BROKEN_SETVBUF], [1], [LynxOS has broken setvbuf() implementation])	1002	AC_DEFINE([BROKEN_SETVBUF], [1], [LynxOS has broken setvbuf() implementation])
1007	;;	1003	;;
1008	esac	1004	esac
Lines 1703-1708 Link Here
1703	#include <stddef.h>	1699	#include <stddef.h>
1704	])	1700	])
1705		1701
		1702	# extra bits for select(2)
		1703	AC_CHECK_DECLS([howmany, NFDBITS], [], [], [[
		1704	#include <sys/param.h>
		1705	#include <sys/types.h>
		1706	#ifdef HAVE_SYS_SYSMACROS_H
		1707	#include <sys/sysmacros.h>
		1708	#endif
		1709	#ifdef HAVE_SYS_SELECT_H
		1710	#include <sys/select.h>
		1711	#endif
		1712	#ifdef HAVE_SYS_TIME_H
		1713	#include <sys/time.h>
		1714	#endif
		1715	#ifdef HAVE_UNISTD_H
		1716	#include <unistd.h>
		1717	#endif
		1718	]])
		1719	AC_CHECK_TYPES([fd_mask], [], [], [[
		1720	#include <sys/param.h>
		1721	#include <sys/types.h>
		1722	#ifdef HAVE_SYS_SELECT_H
		1723	#include <sys/select.h>
		1724	#endif
		1725	#ifdef HAVE_SYS_TIME_H
		1726	#include <sys/time.h>
		1727	#endif
		1728	#ifdef HAVE_UNISTD_H
		1729	#include <unistd.h>
		1730	#endif
		1731	]])
		1732
1706	AC_CHECK_FUNCS([setresuid], [	1733	AC_CHECK_FUNCS([setresuid], [
1707	dnl Some platorms have setresuid that isn't implemented, test for this	1734	dnl Some platorms have setresuid that isn't implemented, test for this
1708	AC_MSG_CHECKING([if setresuid seems to work])	1735	AC_MSG_CHECKING([if setresuid seems to work])

Lines 171-181 Link Here

(-)defines.h.old (-12 / +10 lines)
171	# define MAP_FAILED ((void *)-1)	171	# define MAP_FAILED ((void *)-1)
172	#endif	172	#endif
173		173
174	/* --nto-qnx doesn't define this constant in the system headers */
175	#ifdef MISSING_NFDBITS
176	# define NFDBITS (8 * sizeof(unsigned long))
177	#endif
178
179	/*	174	/*
180	SCO Open Server 3 has INADDR_LOOPBACK defined in rpc/rpc.h but	175	SCO Open Server 3 has INADDR_LOOPBACK defined in rpc/rpc.h but
181	including rpc/rpc.h breaks Solaris 6	176	including rpc/rpc.h breaks Solaris 6
Lines 355-365 Link Here
355	};	350	};
356	#endif	351	#endif
357		352
358	/* --nto-qnx does not define this type in the system headers */	353	/* bits needed for select that may not be in the system headers */
359	#ifdef MISSING_FD_MASK	354	#ifndef HAVE_FD_MASK
360	typedef unsigned long int fd_mask;	355	typedef unsigned long int fd_mask;
361	#endif	356	#endif
362		357
		358	#if defined(HAVE_DECL_NFDBITS) && HAVE_DECL_NFDBITS == 0
		359	# define NFDBITS (8 * sizeof(unsigned long))
		360	#endif
		361
		362	#if defined(HAVE_DECL_HOWMANY) && HAVE_DECL_HOWMANY == 0
		363	# define howmany(x,y) (((x)+((y)-1))/(y))
		364	#endif
		365
363	/* Paths */	366	/* Paths */
364		367
365	#ifndef _PATH_BSHELL	368	#ifndef _PATH_BSHELL
Lines 484-494 Link Here
484	# define __nonnull__(x)	487	# define __nonnull__(x)
485	#endif	488	#endif
486		489
487	/* --nto-qnx doesn't define this macro in the system headers */
488	#ifdef MISSING_HOWMANY
489	# define howmany(x,y) (((x)+((y)-1))/(y))
490	#endif
491
492	#ifndef OSSH_ALIGNBYTES	490	#ifndef OSSH_ALIGNBYTES
493	#define OSSH_ALIGNBYTES (sizeof(int) - 1)	491	#define OSSH_ALIGNBYTES (sizeof(int) - 1)
494	#endif	492	#endif