[BACK]Return to dirent.h CVS log [TXT][DIR] Up to [local] / src / include

Diff for /src/include/dirent.h between version 1.14 and 1.15

version 1.14, 2005/06/18 18:09:42 version 1.15, 2005/12/13 00:35:22
Line 35 
Line 35 
 #ifndef _DIRENT_H_  #ifndef _DIRENT_H_
 #define _DIRENT_H_  #define _DIRENT_H_
   
   #include <sys/cdefs.h>
   
 /*  /*
  * POSIX doesn't mandate this, but X/Open XPG 4.2 does.   * POSIX doesn't mandate this, but X/Open XPG 4.2 does.
  */   */
 #ifndef _POSIX_SOURCE  #if __BSD_VISIBLE || __XPG_VISIBLE >= 420
 #include <sys/types.h>  #include <sys/types.h>
 #endif  #endif
   
Line 48 
Line 50 
  */   */
 #include <sys/dirent.h>  #include <sys/dirent.h>
   
 #ifdef _POSIX_SOURCE  #if __BSD_VISIBLE || __XPG_VISIBLE
 typedef void *  DIR;  
 #else  
   
 #define d_ino           d_fileno        /* backward compatibility */  #define d_ino           d_fileno        /* backward compatibility */
   #endif
   
   #if __BSD_VISIBLE
   
 /* definitions for library routines operating on directories. */  /* definitions for library routines operating on directories. */
 #define DIRBLKSIZ       1024  #define DIRBLKSIZ       1024
   
Line 80 
Line 82 
 #define NULL    __null  #define NULL    __null
 #else  #else
 #define NULL    0L  #define NULL    0L
 #endif  #endif /* __GNUG__ */
 #endif  #endif /* !NULL */
   
 #endif /* _POSIX_SOURCE */  #else /* !__BSD_VISIBLE */
   
 #ifndef _KERNEL  typedef void *  DIR;
   
 #include <sys/cdefs.h>  #endif /* !__BSD_VISIBLE */
   
   #ifndef _KERNEL
 __BEGIN_DECLS  __BEGIN_DECLS
 DIR *opendir(const char *);  DIR *opendir(const char *);
 struct dirent *readdir(DIR *);  struct dirent *readdir(DIR *);
 void rewinddir(DIR *);  void rewinddir(DIR *);
 int closedir(DIR *);  int closedir(DIR *);
 #ifndef _POSIX_SOURCE  #if __BSD_VISIBLE
 DIR *__opendir2(const char *, int);  DIR *__opendir2(const char *, int);
 long telldir(const DIR *);  
 void seekdir(DIR *, long);  
 int scandir(const char *, struct dirent ***,  int scandir(const char *, struct dirent ***,
     int (*)(struct dirent *), int (*)(const void *, const void *));      int (*)(struct dirent *), int (*)(const void *, const void *));
 int alphasort(const void *, const void *);  int alphasort(const void *, const void *);
 int getdirentries(int, char *, int, long *)  int getdirentries(int, char *, int, long *)
                 __attribute__ ((__bounded__(__string__,2,3)));                  __attribute__ ((__bounded__(__string__,2,3)));
 #endif /* not POSIX */  #endif /* __BSD_VISIBLE */
   #if __XPG_VISIBLE
   long telldir(const DIR *);
   void seekdir(DIR *, long);
   #endif
   #if __POSIX_VISIBLE >= 199506 || __XPG_VISIBLE >= 500
 int readdir_r(DIR *, struct dirent *, struct dirent **);  int readdir_r(DIR *, struct dirent *, struct dirent **);
   #endif
 __END_DECLS  __END_DECLS
   
 #endif /* !_KERNEL */  #endif /* !_KERNEL */
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15