win32/os.h.diff

*** Vendors/Apache/Apache/src/os/win32/os.h	2001/02/02 08:36:15	1.1
--- Vendors/Apache/Apache/src/os/win32/os.h	2001/02/28 10:08:50	1.4
***************
*** 109,119 ****
--- 109,121 ----
  #define HAVE_UNC_PATHS
  typedef int uid_t;
  typedef int gid_t;
+ #ifndef __MINGW32__
  typedef int pid_t;
  #ifdef _MSC_VER
  /* modified to match declaration in sys/stat.h */
  typedef unsigned short mode_t;
  #endif
+ #endif /* !__MINGW32__ */
  typedef char * caddr_t;
  
  /*
***************
*** 163,168 ****
--- 165,171 ----
  #define NO_OTHER_CHILD
  #define NO_RELIABLE_PIPED_LOGS
  
+ #ifndef _AP_OS_IS_PATH_ABS_
  __inline int ap_os_is_path_absolute(const char *file)
  {
    /* For now, just do the same check that http_request.c and mod_alias.c
***************
*** 170,175 ****
--- 173,179 ----
     */
    return file && (file[0] == '/' || (file[1] == ':' && file[2] == '/'));
  }
+ #endif
  
  #define stat(f,ps)  os_stat(f,ps)
  API_EXPORT(int) os_stat(const char *szPath,struct stat *pStat);