apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/include/arch/win32 misc.h
Date Wed, 21 Nov 2001 17:46:17 GMT
wrowe       01/11/21 09:46:17

  Modified:    include/arch/unix misc.h
               include/arch/win32 misc.h
  Log:
    Clean up a _whole_ lot of win32 specific cruft here.
  
  Revision  Changes    Path
  1.31      +0 -88     apr/include/arch/unix/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/unix/misc.h,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- misc.h	2001/11/20 02:52:22	1.30
  +++ misc.h	2001/11/21 17:46:17	1.31
  @@ -102,93 +102,5 @@
   #define WSALowByte 0
   #endif
   
  -#ifdef WIN32
  -/* Platform specific designation of run time os version.
  - * Gaps allow for specific service pack levels that
  - * export new kernel or winsock functions or behavior.
  - */
  -typedef enum {
  -        APR_WIN_95 = 0,
  -        APR_WIN_98 = 4,
  -        APR_WIN_NT = 8,
  -        APR_WIN_NT_4 = 12,
  -        APR_WIN_NT_4_SP2 = 14,
  -        APR_WIN_NT_4_SP3 = 15,
  -        APR_WIN_NT_4_SP4 = 16,
  -        APR_WIN_NT_4_SP6 = 18,
  -        APR_WIN_2000 = 24
  -} apr_oslevel_e;
  -
  -
  -typedef enum {
  -    DLL_WINBASEAPI = 0,    // kernel32 From WinBase.h
  -    DLL_WINADVAPI = 1,     // advapi32 From WinBase.h
  -    DLL_WINSOCKAPI = 2,    // mswsock  From WinSock.h
  -    DLL_WINSOCK2API = 3,   // ws2_32   From WinSock2.h
  -    DLL_defined = 4        // must define as last idx_ + 1
  -} apr_dlltoken_e;
  -
  -FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal);
  -
  -/* The apr_load_dll_func call WILL fault if the function cannot be loaded */
  -
  -#define APR_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \
  -    typedef rettype (calltype *apr_winapi_fpt_##fn) args; \
  -    static apr_winapi_fpt_##fn apr_winapi_pfn_##fn = NULL; \
  -    __inline rettype apr_winapi_##fn args \
  -    {   if (!apr_winapi_pfn_##fn) \
  -            apr_winapi_pfn_##fn = (apr_winapi_fpt_##fn) \
  -                                      apr_load_dll_func(lib, #fn, ord); \
  -        return (*(apr_winapi_pfn_##fn)) names; }; \
  -
  -/* Provide late bound declarations of every API function missing from
  - * one or more supported releases of the Win32 API
  - *
  - * lib is the enumerated token from apr_dlltoken_e, and must correspond
  - * to the string table entry in start.c used by the apr_load_dll_func().
  - * Token names (attempt to) follow Windows.h declarations prefixed by DLL_
  - * in order to facilitate comparison.  Use the exact declaration syntax
  - * and names from Windows.h to prevent ambigutity and bugs.
  - *
  - * rettype and calltype follow the original declaration in Windows.h
  - * fn is the true function name - beware Ansi/Unicode #defined macros
  - * ord is the ordinal within the library, use 0 if it varies between versions
  - * args is the parameter list following the original declaration, in parens
  - * names is the parameter list sans data types, enclosed in parens
  - *
  - * #undef/re#define the Ansi/Unicode generic name to abate confusion
  - * In the case of non-text functions, simply #define the original name
  - */
  -
  -#ifdef GetFileAttributesExA
  -#undef GetFileAttributesExA
  -#endif
  -APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExA, 0, (
  -    IN LPCSTR lpFileName,
  -    IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
  -    OUT LPVOID lpFileInformation),
  -    (lpFileName, fInfoLevelId, lpFileInformation));
  -#define GetFileAttributesExA apr_winapi_GetFileAttributesExA
  -#undef GetFileAttributesEx
  -#define GetFileAttributesEx apr_winapi_GetFileAttributesExA
  -
  -#ifdef GetFileAttributesExW
  -#undef GetFileAttributesExW
  -#endif
  -APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExW, 0, (
  -    IN LPCWSTR lpFileName,
  -    IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
  -    OUT LPVOID lpFileInformation),
  -    (lpFileName, fInfoLevelId, lpFileInformation));
  -#define GetFileAttributesExW apr_winapi_GetFileAttributesExW
  -
  -APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, (
  -    IN HANDLE hFile),
  -    (hFile));
  -#define CancelIo apr_winapi_CancelIo
  -
  -apr_status_t apr_get_oslevel(struct apr_pool_t *, apr_oslevel_e *);
  -#endif /* WIN32 */
  -
   #endif  /* ! MISC_H */
   
  
  
  
  1.31      +0 -4      apr/include/arch/win32/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/win32/misc.h,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- misc.h	2001/11/20 02:52:22	1.30
  +++ misc.h	2001/11/21 17:46:17	1.31
  @@ -84,10 +84,6 @@
   #include <string.h>
   #endif
   
  -#ifdef BEOS
  -#include <kernel/OS.h>
  -#endif
  -
   struct apr_other_child_rec_t {
       apr_pool_t *p;
       struct apr_other_child_rec_t *next;
  
  
  

Mime
View raw message