diff options
-rw-r--r-- | acconfig.h | 16 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | includes.h | 15 |
3 files changed, 22 insertions, 11 deletions
diff --git a/acconfig.h b/acconfig.h index 2844bdca2..05296f9ba 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -34,6 +34,10 @@ | |||
34 | 34 | ||
35 | /* ******************* Shouldn't need to edit below this line ************** */ | 35 | /* ******************* Shouldn't need to edit below this line ************** */ |
36 | 36 | ||
37 | #include <sys/types.h> /* For u_intXX_t */ | ||
38 | #include <sys/socket.h> /* For SHUT_XXXX */ | ||
39 | #include <paths.h> /* For _PATH_XXX */ | ||
40 | |||
37 | #ifndef SHUT_RDWR | 41 | #ifndef SHUT_RDWR |
38 | enum | 42 | enum |
39 | { | 43 | { |
@@ -46,9 +50,6 @@ enum | |||
46 | }; | 50 | }; |
47 | #endif | 51 | #endif |
48 | 52 | ||
49 | #include <sys/types.h> /* For u_intXX_t */ | ||
50 | #include <paths.h> /* For _PATH_XXX */ | ||
51 | |||
52 | #if !defined(u_int32_t) && defined(uint32_t) | 53 | #if !defined(u_int32_t) && defined(uint32_t) |
53 | #define u_int32_t uint32_t | 54 | #define u_int32_t uint32_t |
54 | #endif | 55 | #endif |
@@ -57,6 +58,10 @@ enum | |||
57 | #define u_int16_t uint16_t | 58 | #define u_int16_t uint16_t |
58 | #endif | 59 | #endif |
59 | 60 | ||
61 | #if !defined(quad_t) && defined(int64_t) | ||
62 | #define quad_t int64_t | ||
63 | #endif | ||
64 | |||
60 | #ifndef _PATH_LASTLOG | 65 | #ifndef _PATH_LASTLOG |
61 | # ifdef LASTLOG_LOCATION | 66 | # ifdef LASTLOG_LOCATION |
62 | # define _PATH_LASTLOG LASTLOG_LOCATION | 67 | # define _PATH_LASTLOG LASTLOG_LOCATION |
@@ -88,3 +93,8 @@ enum | |||
88 | # define _PATH_MAILDIR MAILDIR | 93 | # define _PATH_MAILDIR MAILDIR |
89 | # endif | 94 | # endif |
90 | #endif | 95 | #endif |
96 | |||
97 | #ifndef MAX | ||
98 | # define MAX(a,b) (((a)>(b))?(a):(b)) | ||
99 | # define MIN(a,b) (((a)<(b))?(a):(b)) | ||
100 | #endif | ||
diff --git a/configure.in b/configure.in index 9fe1a92ff..05a354d1a 100644 --- a/configure.in +++ b/configure.in | |||
@@ -55,7 +55,7 @@ AC_CHECK_LIB(dl, dlopen, , ) | |||
55 | AC_CHECK_LIB(pam, pam_authenticate, , ) | 55 | AC_CHECK_LIB(pam, pam_authenticate, , ) |
56 | 56 | ||
57 | dnl Checks for header files. | 57 | dnl Checks for header files. |
58 | AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h shadow.h netgroup.h maillock.h) | 58 | AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h shadow.h netgroup.h maillock.h sys/select.h) |
59 | 59 | ||
60 | dnl Checks for library functions. | 60 | dnl Checks for library functions. |
61 | AC_CHECK_FUNCS(openpty strlcpy mkdtemp arc4random setproctitle setlogin) | 61 | AC_CHECK_FUNCS(openpty strlcpy mkdtemp arc4random setproctitle setlogin) |
diff --git a/includes.h b/includes.h index e2a0ea3b6..75349cf3e 100644 --- a/includes.h +++ b/includes.h | |||
@@ -19,9 +19,10 @@ This file includes most of the needed system headers. | |||
19 | #define RCSID(msg) \ | 19 | #define RCSID(msg) \ |
20 | static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | 20 | static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } |
21 | 21 | ||
22 | #include "config.h" | ||
23 | |||
22 | #include <sys/types.h> | 24 | #include <sys/types.h> |
23 | #include <sys/socket.h> | 25 | #include <sys/socket.h> |
24 | #include <sys/select.h> | ||
25 | #include <sys/param.h> | 26 | #include <sys/param.h> |
26 | #include <sys/ioctl.h> | 27 | #include <sys/ioctl.h> |
27 | #include <sys/stat.h> | 28 | #include <sys/stat.h> |
@@ -52,8 +53,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
52 | #include <time.h> | 53 | #include <time.h> |
53 | #include <dirent.h> | 54 | #include <dirent.h> |
54 | 55 | ||
55 | #include "config.h" | ||
56 | |||
57 | #ifdef HAVE_NETGROUP_H | 56 | #ifdef HAVE_NETGROUP_H |
58 | # include <netgroup.h> | 57 | # include <netgroup.h> |
59 | #endif | 58 | #endif |
@@ -63,16 +62,18 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
63 | #ifdef HAVE_ENDIAN_H | 62 | #ifdef HAVE_ENDIAN_H |
64 | # include <endian.h> | 63 | # include <endian.h> |
65 | #endif | 64 | #endif |
65 | #ifdef HAVE_SYS_SELECT_H | ||
66 | # include <sys/select.h> | ||
67 | #endif | ||
68 | #ifdef HAVE_LIBPAM | ||
69 | # include <security/pam_appl.h> | ||
70 | #endif /* HAVE_PAM */ | ||
66 | 71 | ||
67 | #include "version.h" | 72 | #include "version.h" |
68 | #include "helper.h" | 73 | #include "helper.h" |
69 | #include "mktemp.h" | 74 | #include "mktemp.h" |
70 | #include "strlcpy.h" | 75 | #include "strlcpy.h" |
71 | 76 | ||
72 | #ifdef HAVE_LIBPAM | ||
73 | #include <security/pam_appl.h> | ||
74 | #endif /* HAVE_PAM */ | ||
75 | |||
76 | /* Define this to be the path of the xauth program. */ | 77 | /* Define this to be the path of the xauth program. */ |
77 | #ifndef XAUTH_PATH | 78 | #ifndef XAUTH_PATH |
78 | #define XAUTH_PATH "/usr/X11R6/bin/xauth" | 79 | #define XAUTH_PATH "/usr/X11R6/bin/xauth" |