diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-11-13 10:51:14 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-11-13 23:19:05 +1100 |
| commit | 4f8ba5ad6ac9b7153b0e13654e59f47e67b3f608 (patch) | |
| tree | ca189d440b0a298cdcb3769d994828508dcd2e76 /source4/heimdal/lib/roken | |
| parent | 5bc87c14a1f5b45ed86e7ff9663f5f0aa2f70094 (diff) | |
| download | samba-4f8ba5ad6ac9b7153b0e13654e59f47e67b3f608.tar.gz samba-4f8ba5ad6ac9b7153b0e13654e59f47e67b3f608.tar.bz2 samba-4f8ba5ad6ac9b7153b0e13654e59f47e67b3f608.zip | |
s4:heimdal: import lorikeet-heimdal-200911122202 (commit 9291fd2d101f3eecec550178634faa94ead3e9a1)
Diffstat (limited to 'source4/heimdal/lib/roken')
| -rw-r--r-- | source4/heimdal/lib/roken/rkpty.c | 4 | ||||
| -rw-r--r-- | source4/heimdal/lib/roken/roken.h.in | 14 |
2 files changed, 17 insertions, 1 deletions
diff --git a/source4/heimdal/lib/roken/rkpty.c b/source4/heimdal/lib/roken/rkpty.c index 2776c1318b..6043e2b815 100644 --- a/source4/heimdal/lib/roken/rkpty.c +++ b/source4/heimdal/lib/roken/rkpty.c @@ -93,6 +93,10 @@ caught_signal(int signo) static void open_pty(void) { +#ifdef _AIX + printf("implement open_pty\n"); + exit(77); +#endif #if defined(HAVE_OPENPTY) || defined(__linux) || defined(__osf__) /* XXX */ if(openpty(&master, &slave, line, 0, 0) == 0) return; diff --git a/source4/heimdal/lib/roken/roken.h.in b/source4/heimdal/lib/roken/roken.h.in index 2bd471736c..6fc533c697 100644 --- a/source4/heimdal/lib/roken/roken.h.in +++ b/source4/heimdal/lib/roken/roken.h.in @@ -306,6 +306,12 @@ int ROKEN_LIB_FUNCTION getdtablesize(void); char * ROKEN_LIB_FUNCTION strerror(int); #endif +#if !defined(HAVE_STRERROR) && !defined(strerror) +#define strerror_r rk_strerror_r +int ROKEN_LIB_FUNCTION strerror_r(int, char *, size_t); +#endif + + #if !defined(HAVE_HSTRERROR) || defined(NEED_HSTRERROR_PROTO) #ifndef HAVE_HSTRERROR #define hstrerror rk_hstrerror @@ -476,7 +482,7 @@ unsigned short ROKEN_LIB_FUNCTION bswap16(unsigned short); int rk_flock(int fd, int operation); #endif /* HAVE_FLOCK */ -#ifdef SunOS +#if defined(SunOS) || defined(_AIX) #define dirfd(x) ((x)->dd_fd) #endif @@ -799,6 +805,12 @@ time_t ROKEN_LIB_FUNCTION rk_timegm(struct tm *tm); #endif +#ifdef NEED_QSORT +#define qsort rk_qsort +void +rk_qsort(void *, size_t, size_t, int (*)(const void *, const void *)); +#endif + #ifdef SOCKET_WRAPPER_REPLACE #include <socket_wrapper.h> #endif |