httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Paul Sutton <...@hyperreal.org>
Subject cvs commit: apachen/src/main conf.h
Date Fri, 12 Sep 1997 08:09:12 GMT
pcs         97/09/12 01:09:10

  Modified:    src/main conf.h
  Log:
  Now conf.h can include os.h in Win32 builds as well. the (large) Win32
  section from conf.h is now in os/win32/os.h.
  
  Revision  Changes    Path
  1.135     +2 -67     apachen/src/main/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/conf.h,v
  retrieving revision 1.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- conf.h	1997/09/12 07:36:34	1.134
  +++ conf.h	1997/09/12 08:09:09	1.135
  @@ -55,9 +55,8 @@
    * See README for a listing of what they mean
    */
   
  -#if !defined(WIN32)
  +
   #include "os.h"
  -#endif
   
   #if !defined(QNX) && !defined(MPE) && !defined(WIN32)
   #include <sys/param.h>
  @@ -629,73 +628,9 @@
   #define isascii(c)	(!((c) & ~0177))
   
   #elif defined(WIN32)     
  -/* Put your NT stuff here - Ambarish */
   
  -/* temporarily replace crypt */
  -/* char *crypt(const char *pw, const char *salt); */
  -#define crypt(buf,salt)	    (buf)
  -
  -/* Although DIR_TYPE is dirent (see nt/readdir.h) we need direct.h for
  -   chdir() */
  -#include <direct.h>
  -
  -#define STATUS
  -#define WIN32_LEAN_AND_MEAN
  -#define STRICT
  -#define NO_UNISTD_H
  -#define NO_WRITEV
  -#define NO_SETSID
  -#define NO_USE_SIGACTION
  -#define NO_TIMES
  -#define NO_GETTIMEOFDAY
  -#define NEED_PROCESS_H
  -#define USE_LONGJMP
  -#define HAVE_MMAP
  -#define MULTITHREAD
  -#define HAVE_CANONICAL_FILENAME
  -typedef int uid_t;
  -typedef int gid_t;
  -typedef int pid_t;
  -typedef int mode_t;
  -typedef char * caddr_t;
  +/* All windows stuff is now in os/win32/os.h */
   
  -/*
  -Define export types. API_EXPORT_NONSTD is a nasty hack to avoid having to declare
  -every configuration function as __stdcall.
  -*/
  -
  -#define API_EXPORT(type)    __declspec(dllexport) type __stdcall
  -#define API_EXPORT_NONSTD(type)    __declspec(dllexport) type
  -#ifdef IS_MODULE
  -# define API_VAR_EXPORT		__declspec(dllimport)
  -#else
  -# define API_VAR_EXPORT		__declspec(dllexport)
  -#endif
  -#define MODULE_VAR_EXPORT   __declspec(dllexport)
  -
  -#define strcasecmp(s1, s2) stricmp(s1, s2)
  -#define strncasecmp(s1, s2, n) strnicmp(s1, s2, n)
  -#define lstat(x, y) stat(x, y)
  -#define S_ISLNK(m) (0)
  -#define S_ISREG(m) ((m & _S_IFREG) == _S_IFREG)
  -#ifndef S_ISDIR
  -#define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR)
  -#endif
  -#ifndef S_ISREG
  -#define S_ISREG(m)      (((m)&(S_IFREG)) == (S_IFREG))
  -#endif
  -#define STDIN_FILENO  0
  -#define STDOUT_FILENO 1
  -#define STDERR_FILENO 2
  -#define JMP_BUF jmp_buf
  -#define sleep(t) Sleep(t*1000)
  -#define O_CREAT _O_CREAT
  -#define O_RDWR _O_RDWR
  -#define SIGPIPE 17
  -/* Seems Windows is not a subgenius */
  -#define NO_SLACK
  -#include <stddef.h>
  -/* Unknown system - Edit these to match */
   #else
   #ifdef BSD
   #define HAVE_GMTOFF
  
  
  

Mime
View raw message