CVS: rdesktop configure.ac,1.1,1.2 disk.c,1.28,1.29

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26887

Modified Files:
	configure.ac disk.c 
Log Message:
use dirfd-autoconf test


Index: configure.ac
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configure.ac	31 Jul 2004 13:07:41 -0000	1.1
--- configure.ac	6 Aug 2004 09:50:34 -0000	1.2
***************
*** 155,158 ****
--- 155,162 ----
  AC_SUBST(SOUNDOBJ)
  
+ #
+ # dirfd
+ #
+ UTILS_FUNC_DIRFD
  
  #

Index: disk.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/disk.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** disk.c	11 May 2004 13:52:22 -0000	1.28
--- disk.c	6 Aug 2004 09:50:34 -0000	1.29
***************
*** 21,34 ****
  #include "disk.h"
  
- #if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
- #define SOLARIS
- #endif
- 
- #if (defined(SOLARIS) || defined(__hpux))
- #define DIRFD(a) ((a)->dd_fd)
- #else
- #define DIRFD(a) (dirfd(a))
- #endif
- 
  #include <sys/types.h>
  #include <sys/stat.h>
--- 21,24 ----
***************
*** 42,45 ****
--- 32,45 ----
  #include <time.h>		/* ctime */
  
+ #if defined(HAVE_DIRFD)
+ #define DIRFD(a) (dirfd(a))
+ #else
+ #define DIRFD(a) ((a)->DIR_FD_MEMBER_NAME)
+ #endif
+ 
+ /* TODO: let autoconf figure out everything below... */
+ #if (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
+ #define SOLARIS
+ #endif
  
  #if (defined(SOLARIS) || defined (__hpux) || defined(__BEOS__))



-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com