You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/10/15 21:38:52 UTC
cvs commit: apache-2.0/src/os/win32 os.h
wrowe 00/10/15 12:38:52
Modified: src/os/win32 os.h
Log:
Eliminating a bunch-o-junk from the Win32 os.h header that now lives
in apr or isn't used. Please review closely (every symbol removed was
grep't for, and no references were found.)
Revision Changes Path
1.42 +1 -26 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- os.h 2000/10/12 14:21:30 1.41
+++ os.h 2000/10/15 19:38:50 1.42
@@ -81,33 +81,17 @@
#define PLATFORM "Win32"
-/*
- * This file in included in all Apache source code. It contains definitions
- * of facilities available on _this_ operating system (HAVE_* macros),
- * and prototypes of OS specific functions defined in os.c
- */
-
-/* temporarily replace crypt */
-/* char *crypt(const char *pw, const char *salt); */
-#define crypt(buf,salt) (buf)
+#define APACHE_MPM_DIR "modules/mpm/winnt" /* generated on unix */
/* Although DIR_TYPE is dirent (see nt/readdir.h) we need direct.h for
chdir() */
#include <direct.h>
-#define STATUS
-#ifndef STRICT
-#define STRICT
-#endif
#define CASE_BLIND_FILESYSTEM
#define NO_WRITEV
-#define NO_USE_SIGACTION
-/* #undef HAVE_TIMES */
-#define USE_LONGJMP
#define HAVE_CANONICAL_FILENAME
#define HAVE_DRIVE_LETTERS
#define HAVE_UNC_PATHS
-#define HAVE_SENDFILE
typedef int uid_t;
typedef int gid_t;
@@ -115,8 +99,6 @@
typedef int mode_t;
typedef char * caddr_t;
-#define HAVE_MEMMOVE
-
#define S_ISLNK(m) (0)
#define S_ISREG(m) ((m & _S_IFREG) == _S_IFREG)
#ifndef S_ISDIR
@@ -129,9 +111,6 @@
#define JMP_BUF jmp_buf
#define O_CREAT _O_CREAT
#define O_RDWR _O_RDWR
-/* Seems Windows is not a subgenius */
-#define NO_SLACK
-#define APACHE_MPM_DIR "modules/mpm/winnt" /* generated on unix */
#include <stddef.h>
@@ -150,10 +129,6 @@
API_EXPORT(char *) ap_os_case_canonical_filename(apr_pool_t *pPool, const char *szFile);
API_EXPORT(char *) ap_os_systemcase_filename(apr_pool_t *pPool, const char *szFile);
API_EXPORT(int) ap_os_is_filename_valid(const char *file);
-
-#define ap_os_dso_error() "" /* for now */
-/* Other ap_os_ routines not used by this platform */
-#define ap_os_kill(pid, sig) kill(pid, sig)
typedef void thread;
typedef void event;