Deleted Added
full compact
apr.hw (302408) apr.hw (362181)
1/* Licensed to the Apache Software Foundation (ASF) under one or more
2 * contributor license agreements. See the NOTICE file distributed with
3 * this work for additional information regarding copyright ownership.
4 * The ASF licenses this file to You under the Apache License, Version 2.0
5 * (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0

--- 11 unchanged lines hidden (view full) ---

20
21/* GENERATED FILE WARNING! DO NOT EDIT apr.h
22 *
23 * You must modify apr.hw instead.
24 *
25 * And please, make an effort to stub apr.hnw and apr.h.in in the process.
26 *
27 * This is the Win32 specific version of apr.h. It is copied from
1/* Licensed to the Apache Software Foundation (ASF) under one or more
2 * contributor license agreements. See the NOTICE file distributed with
3 * this work for additional information regarding copyright ownership.
4 * The ASF licenses this file to You under the Apache License, Version 2.0
5 * (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0

--- 11 unchanged lines hidden (view full) ---

20
21/* GENERATED FILE WARNING! DO NOT EDIT apr.h
22 *
23 * You must modify apr.hw instead.
24 *
25 * And please, make an effort to stub apr.hnw and apr.h.in in the process.
26 *
27 * This is the Win32 specific version of apr.h. It is copied from
28 * apr.hw by the apr.dsp and libapr.dsp projects.
28 * apr.hw by the apr.dsp and libapr.dsp projects.
29 */
30
31/**
32 * @file apr.h
33 * @brief APR Platform Definitions
34 * @remark This is a generated header generated from include/apr.h.in by
35 * ./configure, or copied from include/apr.hw or include/apr.hnw
36 * for Win32 or Netware by those build environments, respectively.

--- 18 unchanged lines hidden (view full) ---

55 * C4075: slight indirection changes (unsigned short* vs short[])
56 * C4100: unreferenced formal parameter
57 * C4127: conditional expression is constant
58 * C4163: '_rotl64' : not available as an intrinsic function
59 * C4201: nonstandard extension nameless struct/unions
60 * C4244: int to char/short - precision loss
61 * C4514: unreferenced inline function removed
62 */
29 */
30
31/**
32 * @file apr.h
33 * @brief APR Platform Definitions
34 * @remark This is a generated header generated from include/apr.h.in by
35 * ./configure, or copied from include/apr.hw or include/apr.hnw
36 * for Win32 or Netware by those build environments, respectively.

--- 18 unchanged lines hidden (view full) ---

55 * C4075: slight indirection changes (unsigned short* vs short[])
56 * C4100: unreferenced formal parameter
57 * C4127: conditional expression is constant
58 * C4163: '_rotl64' : not available as an intrinsic function
59 * C4201: nonstandard extension nameless struct/unions
60 * C4244: int to char/short - precision loss
61 * C4514: unreferenced inline function removed
62 */
63#if defined(_MSC_VER)
63#pragma warning(disable: 4100 4127 4163 4201 4514; once: 4057 4075 4244)
64#pragma warning(disable: 4100 4127 4163 4201 4514; once: 4057 4075 4244)
65#endif
64
65/* Ignore Microsoft's interpretation of secure development
66 * and the POSIX string handling API
67 */
68#if defined(_MSC_VER) && _MSC_VER >= 1400
69#ifndef _CRT_SECURE_NO_DEPRECATE
70#define _CRT_SECURE_NO_DEPRECATE
71#endif

--- 135 unchanged lines hidden (view full) ---

207#define APR_HAVE_UNISTD_H 0
208#define APR_HAVE_STDDEF_H 0
209#define APR_HAVE_PROCESS_H 0
210#endif
211
212/** @} */
213/** @} */
214
66
67/* Ignore Microsoft's interpretation of secure development
68 * and the POSIX string handling API
69 */
70#if defined(_MSC_VER) && _MSC_VER >= 1400
71#ifndef _CRT_SECURE_NO_DEPRECATE
72#define _CRT_SECURE_NO_DEPRECATE
73#endif

--- 135 unchanged lines hidden (view full) ---

209#define APR_HAVE_UNISTD_H 0
210#define APR_HAVE_STDDEF_H 0
211#define APR_HAVE_PROCESS_H 0
212#endif
213
214/** @} */
215/** @} */
216
215/* We don't include our conditional headers within the doxyblocks
216 * or the extern "C" namespace
217/* We don't include our conditional headers within the doxyblocks
218 * or the extern "C" namespace
217 */
218
219#if APR_HAVE_STDLIB_H
220#include <stdlib.h>
221#endif
219 */
220
221#if APR_HAVE_STDLIB_H
222#include <stdlib.h>
223#endif
224
222#if APR_HAVE_STDIO_H
223#include <stdio.h>
224#endif
225#if APR_HAVE_STDIO_H
226#include <stdio.h>
227#endif
228
225#if APR_HAVE_SYS_TYPES_H
226#include <sys/types.h>
227#endif
229#if APR_HAVE_SYS_TYPES_H
230#include <sys/types.h>
231#endif
232
228#if APR_HAVE_STDDEF_H
229#include <stddef.h>
230#endif
233#if APR_HAVE_STDDEF_H
234#include <stddef.h>
235#endif
236
237#if APR_HAVE_SYS_SOCKET_H
238#include <sys/socket.h>
239#endif
240
241#if APR_HAVE_STDINT_H
242#include <stdint.h>
243#endif
244
245#if APR_HAVE_SYS_WAIT_H
246#include <sys/wait.h>
247#endif
248
231#if APR_HAVE_TIME_H
232#include <time.h>
233#endif
249#if APR_HAVE_TIME_H
250#include <time.h>
251#endif
252
234#if APR_HAVE_PROCESS_H
235#include <process.h>
236#endif
237
238#ifdef __cplusplus
239extern "C" {
240#endif
241

--- 14 unchanged lines hidden (view full) ---

256#define APR_USE_SHMEM_MMAP_TMP 0
257#define APR_USE_SHMEM_MMAP_SHM 0
258#define APR_USE_SHMEM_MMAP_ZERO 0
259#define APR_USE_SHMEM_SHMGET_ANON 0
260#define APR_USE_SHMEM_SHMGET 0
261#define APR_USE_SHMEM_MMAP_ANON 0
262#define APR_USE_SHMEM_BEOS 0
263
253#if APR_HAVE_PROCESS_H
254#include <process.h>
255#endif
256
257#ifdef __cplusplus
258extern "C" {
259#endif
260

--- 14 unchanged lines hidden (view full) ---

275#define APR_USE_SHMEM_MMAP_TMP 0
276#define APR_USE_SHMEM_MMAP_SHM 0
277#define APR_USE_SHMEM_MMAP_ZERO 0
278#define APR_USE_SHMEM_SHMGET_ANON 0
279#define APR_USE_SHMEM_SHMGET 0
280#define APR_USE_SHMEM_MMAP_ANON 0
281#define APR_USE_SHMEM_BEOS 0
282
264#define APR_USE_FLOCK_SERIALIZE 0
283#define APR_USE_FLOCK_SERIALIZE 0
265#define APR_USE_POSIXSEM_SERIALIZE 0
266#define APR_USE_SYSVSEM_SERIALIZE 0
267#define APR_USE_FCNTL_SERIALIZE 0
284#define APR_USE_POSIXSEM_SERIALIZE 0
285#define APR_USE_SYSVSEM_SERIALIZE 0
286#define APR_USE_FCNTL_SERIALIZE 0
268#define APR_USE_PROC_PTHREAD_SERIALIZE 0
269#define APR_USE_PTHREAD_SERIALIZE 0
287#define APR_USE_PROC_PTHREAD_SERIALIZE 0
288#define APR_USE_PTHREAD_SERIALIZE 0
270
271#define APR_HAS_FLOCK_SERIALIZE 0
272#define APR_HAS_SYSVSEM_SERIALIZE 0
273#define APR_HAS_POSIXSEM_SERIALIZE 0
274#define APR_HAS_FCNTL_SERIALIZE 0
275#define APR_HAS_PROC_PTHREAD_SERIALIZE 0
276
277#define APR_PROCESS_LOCK_IS_GLOBAL 0
278
279#define APR_HAVE_CORKABLE_TCP 0
280#define APR_HAVE_GETRLIMIT 0
281#define APR_HAVE_ICONV 0
282#define APR_HAVE_IN_ADDR 1
283#define APR_HAVE_INET_ADDR 1
284#define APR_HAVE_INET_NETWORK 0
289
290#define APR_HAS_FLOCK_SERIALIZE 0
291#define APR_HAS_SYSVSEM_SERIALIZE 0
292#define APR_HAS_POSIXSEM_SERIALIZE 0
293#define APR_HAS_FCNTL_SERIALIZE 0
294#define APR_HAS_PROC_PTHREAD_SERIALIZE 0
295
296#define APR_PROCESS_LOCK_IS_GLOBAL 0
297
298#define APR_HAVE_CORKABLE_TCP 0
299#define APR_HAVE_GETRLIMIT 0
300#define APR_HAVE_ICONV 0
301#define APR_HAVE_IN_ADDR 1
302#define APR_HAVE_INET_ADDR 1
303#define APR_HAVE_INET_NETWORK 0
285#define APR_HAVE_IPV6 0
304#define APR_HAVE_IPV6 1
305#define APR_HAVE_SOCKADDR_UN 0
286#define APR_HAVE_MEMMOVE 1
287#define APR_HAVE_SETRLIMIT 0
288#define APR_HAVE_SIGACTION 0
289#define APR_HAVE_SIGSUSPEND 0
290#define APR_HAVE_SIGWAIT 0
291#define APR_HAVE_SA_STORAGE 0
292#define APR_HAVE_STRCASECMP 0
293#define APR_HAVE_STRDUP 1

--- 20 unchanged lines hidden (view full) ---

314#define APR_HAS_FORK 0
315#define APR_HAS_RANDOM 1
316#define APR_HAS_OTHER_CHILD 1
317#define APR_HAS_DSO 1
318#define APR_HAS_SO_ACCEPTFILTER 0
319#define APR_HAS_UNICODE_FS 1
320#define APR_HAS_PROC_INVOKED 1
321#define APR_HAS_OS_UUID 1
306#define APR_HAVE_MEMMOVE 1
307#define APR_HAVE_SETRLIMIT 0
308#define APR_HAVE_SIGACTION 0
309#define APR_HAVE_SIGSUSPEND 0
310#define APR_HAVE_SIGWAIT 0
311#define APR_HAVE_SA_STORAGE 0
312#define APR_HAVE_STRCASECMP 0
313#define APR_HAVE_STRDUP 1

--- 20 unchanged lines hidden (view full) ---

334#define APR_HAS_FORK 0
335#define APR_HAS_RANDOM 1
336#define APR_HAS_OTHER_CHILD 1
337#define APR_HAS_DSO 1
338#define APR_HAS_SO_ACCEPTFILTER 0
339#define APR_HAS_UNICODE_FS 1
340#define APR_HAS_PROC_INVOKED 1
341#define APR_HAS_OS_UUID 1
342#define APR_HAS_TIMEDLOCKS 1
322
323#ifndef _WIN32_WCE
324#define APR_HAS_SENDFILE 1
325#define APR_HAS_USER 1
326#define APR_HAS_LARGE_FILES 1
327#define APR_HAS_XTHREAD_FILES 1
328#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 1
329#else

--- 19 unchanged lines hidden (view full) ---

349#define APR_TCP_NOPUSH_FLAG @apr_tcp_nopush_flag@
350
351/* Is the TCP_NODELAY socket option inherited from listening sockets?
352 */
353#define APR_TCP_NODELAY_INHERITED 1
354
355/* Is the O_NONBLOCK flag inherited from listening sockets?
356 */
343
344#ifndef _WIN32_WCE
345#define APR_HAS_SENDFILE 1
346#define APR_HAS_USER 1
347#define APR_HAS_LARGE_FILES 1
348#define APR_HAS_XTHREAD_FILES 1
349#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 1
350#else

--- 19 unchanged lines hidden (view full) ---

370#define APR_TCP_NOPUSH_FLAG @apr_tcp_nopush_flag@
371
372/* Is the TCP_NODELAY socket option inherited from listening sockets?
373 */
374#define APR_TCP_NODELAY_INHERITED 1
375
376/* Is the O_NONBLOCK flag inherited from listening sockets?
377 */
357#define APR_O_NONBLOCK_INHERITED 1
378#define APR_O_NONBLOCK_INHERITED 1
358
359/* Typedefs that APR needs. */
360
361typedef unsigned char apr_byte_t;
362
363typedef short apr_int16_t;
364typedef unsigned short apr_uint16_t;
365

--- 255 unchanged lines hidden (view full) ---

621#endif
622
623#ifndef WS2TCPIP_INLINE
624#define IN6_IS_ADDR_V4MAPPED(a) \
625 ( (*(const apr_uint64_t *)(const void *)(&(a)->s6_addr[0]) == 0) \
626 && (*(const apr_uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
627#endif
628
379
380/* Typedefs that APR needs. */
381
382typedef unsigned char apr_byte_t;
383
384typedef short apr_int16_t;
385typedef unsigned short apr_uint16_t;
386

--- 255 unchanged lines hidden (view full) ---

642#endif
643
644#ifndef WS2TCPIP_INLINE
645#define IN6_IS_ADDR_V4MAPPED(a) \
646 ( (*(const apr_uint64_t *)(const void *)(&(a)->s6_addr[0]) == 0) \
647 && (*(const apr_uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
648#endif
649
629#endif /* APR_HAS_IPV6 */
650#endif /* APR_HAVE_IPV6 */
630
631#ifdef __cplusplus
632}
633#endif
634
651
652#ifdef __cplusplus
653}
654#endif
655
635/* Done with badly written headers
656/* Done with badly written headers, leave 'deprecated CRT' undeprecated
636 */
637#if defined(_MSC_VER) && _MSC_VER >= 1200
638#pragma warning(pop)
657 */
658#if defined(_MSC_VER) && _MSC_VER >= 1200
659#pragma warning(pop)
660#if _MSC_VER >= 1400
639#pragma warning(disable: 4996)
640#endif
661#pragma warning(disable: 4996)
662#endif
663#endif
641
642#endif /* WIN32 */
643
644#endif /* APR_H */
664
665#endif /* WIN32 */
666
667#endif /* APR_H */