summaryrefslogtreecommitdiff
path: root/defines.h
diff options
context:
space:
mode:
Diffstat (limited to 'defines.h')
-rw-r--r--defines.h24
1 files changed, 11 insertions, 13 deletions
diff --git a/defines.h b/defines.h
index 64515c2ff..d5ce52f32 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
25#ifndef _DEFINES_H 25#ifndef _DEFINES_H
26#define _DEFINES_H 26#define _DEFINES_H
27 27
28/* $Id: defines.h,v 1.171 2013/03/07 09:06:13 dtucker Exp $ */ 28/* $Id: defines.h,v 1.172 2013/06/01 21:18:48 dtucker Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -171,11 +171,6 @@ enum
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/*
180SCO Open Server 3 has INADDR_LOOPBACK defined in rpc/rpc.h but 175SCO Open Server 3 has INADDR_LOOPBACK defined in rpc/rpc.h but
181including rpc/rpc.h breaks Solaris 6 176including rpc/rpc.h breaks Solaris 6
@@ -355,11 +350,19 @@ struct winsize {
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
@@ -484,11 +487,6 @@ struct winsize {
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