Changeset 331

Show
Ignore:
Timestamp:
07/31/06 12:54:21 (2 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • cherokee/branches/0.5/ChangeLog

    r329 r331  
     12006-07-31  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * cherokee/util.c (cherokee_readdir): Windows compilation 
     4        fixed. Patch by Philip Pemberton <philpem@dsl.pipex.com> 
     5 
    162006-07-28  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
    27 
  • cherokee/branches/0.5/cherokee/util.c

    r322 r331  
    400400cherokee_readdir (DIR *dirstream, struct dirent *entry, struct dirent **result) 
    401401{ 
    402 #ifdef HAVE_READDIR_R_2 
     402#ifdef HAVE_READDIR_H 
     403# ifdef HAVE_READDIR_R_2 
    403404        /* We cannot rely on the return value of readdir_r as it 
    404405         * differs between various platforms (HPUX returns 0 on 
     
    413414                return 0; 
    414415        } 
    415          
     416 
    416417        *result = NULL; 
    417418        return errno; 
    418419 
    419 #elif defined(HAVE_READDIR_R_3) 
     420# elif defined(HAVE_READDIR_R_3) 
    420421        return readdir_r (dirstream, entry, result); 
     422# endif 
    421423 
    422424#else 
    423425        struct dirent *ptr; 
    424426        int            ret = 0; 
    425          
     427 
    426428        CHEROKEE_MUTEX_LOCK (&readdir_mutex); 
    427          
    428         errno = 0;         
     429 
     430        errno = 0; 
    429431        ptr = readdir(dirstream); 
    430432