"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "include/arch/win32/apr_arch_misc.h" between
apr-1.6.5.tar.bz2 and apr-1.7.0.tar.bz2

About: APR (Apache Portable Runtime) project offers software libraries that provide a predictable and consistent interface to underlying platform-specific implementations (APR core library).

apr_arch_misc.h  (apr-1.6.5.tar.bz2):apr_arch_misc.h  (apr-1.7.0.tar.bz2)
skipping to change at line 50 skipping to change at line 50
#if APR_HAVE_STDLIB_H #if APR_HAVE_STDLIB_H
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#if APR_HAVE_STRING_H #if APR_HAVE_STRING_H
#include <string.h> #include <string.h>
#endif #endif
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
#include <tlhelp32.h> #include <tlhelp32.h>
#endif #endif
#if defined(HAVE_IF_INDEXTONAME) && defined(_MSC_VER)
#include <Iphlpapi.h>
#endif
struct apr_other_child_rec_t { struct apr_other_child_rec_t {
apr_pool_t *p; apr_pool_t *p;
struct apr_other_child_rec_t *next; struct apr_other_child_rec_t *next;
apr_proc_t *proc; apr_proc_t *proc;
void (*maintenance) (int, void *, int); void (*maintenance) (int, void *, int);
void *data; void *data;
apr_os_file_t write_fd; apr_os_file_t write_fd;
}; };
#define WSAHighByte 2 #define WSAHighByte 2
skipping to change at line 181 skipping to change at line 185
} }
#endif /* ! _MSC_VER */ #endif /* ! _MSC_VER */
typedef enum { typedef enum {
DLL_WINBASEAPI = 0, /* kernel32 From WinBase.h */ DLL_WINBASEAPI = 0, /* kernel32 From WinBase.h */
DLL_WINADVAPI = 1, /* advapi32 From WinBase.h */ DLL_WINADVAPI = 1, /* advapi32 From WinBase.h */
DLL_WINSOCKAPI = 2, /* mswsock From WinSock.h */ DLL_WINSOCKAPI = 2, /* mswsock From WinSock.h */
DLL_WINSOCK2API = 3, /* ws2_32 From WinSock2.h */ DLL_WINSOCK2API = 3, /* ws2_32 From WinSock2.h */
DLL_SHSTDAPI = 4, /* shell32 From ShellAPI.h */ DLL_SHSTDAPI = 4, /* shell32 From ShellAPI.h */
DLL_NTDLL = 5, /* shell32 From our real kernel */ DLL_NTDLL = 5, /* ntdll From our real kernel */
DLL_defined = 6 /* must define as last idx_ + 1 */ DLL_IPHLPAPI = 6, /* Iphlpapi From Iphlpapi.h */
DLL_defined = 7 /* must define as last idx_ + 1 */
} apr_dlltoken_e; } apr_dlltoken_e;
FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal); FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal);
/* The apr_load_dll_func call WILL return 0 set error to /* The apr_load_dll_func call WILL return 0 set error to
* ERROR_INVALID_FUNCTION if the function cannot be loaded * ERROR_INVALID_FUNCTION if the function cannot be loaded
*/ */
#define APR_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \ #define APR_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \
typedef rettype (calltype *apr_winapi_fpt_##fn) args; \ typedef rettype (calltype *apr_winapi_fpt_##fn) args; \
static apr_winapi_fpt_##fn apr_winapi_pfn_##fn = NULL; \ static apr_winapi_fpt_##fn apr_winapi_pfn_##fn = NULL; \
skipping to change at line 483 skipping to change at line 488
#define HAVE_POLL 1 #define HAVE_POLL 1
#ifdef SetDllDirectoryW #ifdef SetDllDirectoryW
#undef SetDllDirectoryW #undef SetDllDirectoryW
#endif #endif
APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, SetDllDirectoryW, 0, ( APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, SetDllDirectoryW, 0, (
IN LPCWSTR lpPathName), IN LPCWSTR lpPathName),
(lpPathName)); (lpPathName));
#define SetDllDirectoryW apr_winapi_SetDllDirectoryW #define SetDllDirectoryW apr_winapi_SetDllDirectoryW
#ifdef if_nametoindex
#undef if_nametoindex
#endif
APR_DECLARE_LATE_DLL_FUNC(DLL_IPHLPAPI, NET_IFINDEX, WINAPI, if_nametoindex, 0,
(
IN PCSTR InterfaceName),
(InterfaceName));
#define if_nametoindex apr_winapi_if_nametoindex
#ifdef if_indextoname
#undef if_indextoname
#endif
APR_DECLARE_LATE_DLL_FUNC(DLL_IPHLPAPI, PCHAR, NETIOAPI_API_, if_indextoname, 0,
(
NET_IFINDEX InterfaceIndex,
PCHAR InterfaceName),
(InterfaceIndex, InterfaceName));
#define if_indextoname apr_winapi_if_indextoname
#endif /* !defined(_WIN32_WCE) */ #endif /* !defined(_WIN32_WCE) */
#endif /* ! MISC_H */ #endif /* ! MISC_H */
 End of changes. 3 change blocks. 
2 lines changed or deleted 26 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)