httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@hyperreal.org
Subject cvs commit: apache-2.0/src/os/win32 os.h
Date Mon, 13 Sep 1999 18:30:35 GMT
stoddard    99/09/13 11:30:34

  Modified:    src/os/win32 os.h
  Log:
  Cut out cruft... More APR'izing...
  
  Revision  Changes    Path
  1.6       +3 -15     apache-2.0/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/os.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- os.h	1999/09/13 14:07:22	1.5
  +++ os.h	1999/09/13 18:30:32	1.6
  @@ -119,6 +119,7 @@
   every configuration function as __stdcall.
   */
   
  +#if 0 /* Handled by APR... */
   #ifdef SHARED_MODULE
   # define API_VAR_EXPORT		__declspec(dllimport)
   # define API_EXPORT(type)    __declspec(dllimport) type __stdcall
  @@ -128,6 +129,8 @@
   # define API_EXPORT(type)    __declspec(dllexport) type __stdcall
   # define API_EXPORT_NONSTD(type)    __declspec(dllexport) type
   #endif
  +#endif
  +
   #define MODULE_VAR_EXPORT   __declspec(dllexport)
   
   #define strcasecmp(s1, s2) stricmp(s1, s2)
  @@ -145,10 +148,8 @@
   #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>
  @@ -162,23 +163,16 @@
   }
   
   #define stat(f,ps)  os_stat(f,ps)
  -API_EXPORT(int) os_stat(const char *szPath,struct stat *pStat);
   
  -API_EXPORT(int) os_strftime(char *s, size_t max, const char *format, const struct tm *tm);
  -
   #define _spawnv(mode,cmdname,argv)	    os_spawnv(mode,cmdname,argv)
   #define spawnv(mode,cmdname,argv)	    os_spawnv(mode,cmdname,argv)
  -API_EXPORT(int) os_spawnv(int mode,const char *cmdname,const char *const *argv);
   #define _spawnve(mode,cmdname,argv,envp)    os_spawnve(mode,cmdname,argv,envp)
   #define spawnve(mode,cmdname,argv,envp)	    os_spawnve(mode,cmdname,argv,envp)
  -API_EXPORT(int) os_spawnve(int mode,const char *cmdname,const char *const *argv,const char
*const *envp);
   #define _spawnle			    os_spawnle
   #define spawnle				    os_spawnle
  -API_EXPORT(int) os_spawnle(int mode,const char *cmdname,...);
   
   /* OS-dependent filename routines in util_win32.c */
   
  -API_EXPORT(int) ap_os_is_filename_valid(const char *file);
   
   /* Abstractions for dealing with shared object files (DLLs on Win32).
    * These are used by mod_so.c
  @@ -209,12 +203,6 @@
   int await_thread(thread *thread_id, int sec_to_wait);
   void exit_thread(int status);
   void free_thread(thread *thread_id);
  -
  -API_EXPORT(mutex *) ap_create_mutex(char *name);
  -API_EXPORT(mutex *) ap_open_mutex(char *name);
  -API_EXPORT(int) ap_acquire_mutex(mutex *mutex_id);
  -API_EXPORT(int) ap_release_mutex(mutex *mutex_id);
  -API_EXPORT(void) ap_destroy_mutex(mutex *mutex_id);
   
   semaphore *create_semaphore(int initial);
   int acquire_semaphore(semaphore *semaphore_id);
  
  
  

Mime
View raw message