Mercurial > hg > octave-thorsten
changeset 958:41f8acf06573
[project @ 1994-12-05 18:29:46 by jwe]
| author | jwe |
|---|---|
| date | Mon, 05 Dec 1994 18:29:55 +0000 |
| parents | a5b83bace72a |
| children | b527f7cdcc68 |
| files | src/dirfns.cc src/utils.cc |
| diffstat | 2 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dirfns.cc +++ b/src/dirfns.cc @@ -52,22 +52,22 @@ // This mess suggested by the autoconf manual. // unistd.h defines _POSIX_VERSION on POSIX.1 systems. -#if defined(DIRENT) || defined(_POSIX_VERSION) +#if defined (HAVE_DIRENT_H) || defined (_POSIX_VERSION) #include <dirent.h> #define NLENGTH(dirent) (strlen((dirent)->d_name)) -#else /* not (DIRENT or _POSIX_VERSION) */ +#else #define dirent direct #define NLENGTH(dirent) ((dirent)->d_namlen) -#ifdef SYSNDIR +#if defined (HAVE_SYS_NDIR_H) #include <sys/ndir.h> -#endif /* SYSNDIR */ -#ifdef SYSDIR +#endif +#if defined (HAVE_SYS_DIR_H) #include <sys/dir.h> -#endif /* SYSDIR */ -#ifdef NDIR +#endif +#if defined (HAVE_NDIR_H) #include <ndir.h> -#endif /* NDIR */ -#endif /* not (DIRENT or _POSIX_VERSION) */ +#endif +#endif #include "statdefs.h" #include "procstream.h"
--- a/src/utils.cc +++ b/src/utils.cc @@ -66,22 +66,22 @@ // This mess suggested by the autoconf manual. // unistd.h defines _POSIX_VERSION on POSIX.1 systems. -#if defined(DIRENT) || defined(_POSIX_VERSION) +#if defined (HAVE_DIRENT_H) || defined (_POSIX_VERSION) #include <dirent.h> #define NLENGTH(dirent) (strlen((dirent)->d_name)) -#else /* not (DIRENT or _POSIX_VERSION) */ +#else #define dirent direct #define NLENGTH(dirent) ((dirent)->d_namlen) -#ifdef SYSNDIR +#if defined (HAVE_SYS_NDIR_H) #include <sys/ndir.h> -#endif /* SYSNDIR */ -#ifdef SYSDIR +#endif +#if defined (HAVE_SYS_DIR_H) #include <sys/dir.h> -#endif /* SYSDIR */ -#ifdef NDIR +#endif +#if defined (HAVE_NDIR_H) #include <ndir.h> -#endif /* NDIR */ -#endif /* not (DIRENT or _POSIX_VERSION) */ +#endif +#endif #include "SLStack.h"