Deleted Added
full compact
apr.h (255696) apr.h (266736)
1/* $FreeBSD: head/usr.bin/svn/lib/libapr/apr.h 255696 2013-09-19 06:31:03Z dim $ */
1/* $FreeBSD: head/usr.bin/svn/lib/libapr/apr.h 266736 2014-05-27 07:16:43Z peter $ */
2
3/* Licensed to the Apache Software Foundation (ASF) under one or more
4 * contributor license agreements. See the NOTICE file distributed with
5 * this work for additional information regarding copyright ownership.
6 * The ASF licenses this file to You under the Apache License, Version 2.0
7 * (the "License"); you may not use this file except in compliance with
8 * the License. You may obtain a copy of the License at
9 *

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

113
114/** @} */
115/** @} */
116
117/* We don't include our conditional headers within the doxyblocks
118 * or the extern "C" namespace
119 */
120
2
3/* Licensed to the Apache Software Foundation (ASF) under one or more
4 * contributor license agreements. See the NOTICE file distributed with
5 * this work for additional information regarding copyright ownership.
6 * The ASF licenses this file to You under the Apache License, Version 2.0
7 * (the "License"); you may not use this file except in compliance with
8 * the License. You may obtain a copy of the License at
9 *

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

113
114/** @} */
115/** @} */
116
117/* We don't include our conditional headers within the doxyblocks
118 * or the extern "C" namespace
119 */
120
121#if APR_HAVE_WINDOWS_H
121#if APR_HAVE_WINDOWS_H && defined(WIN32)
122/* If windows.h was already included, our preferences don't matter.
123 * If not, include a restricted set of windows headers to our tastes.
124 */
125#ifndef _WINDOWS_
126
127#ifndef WIN32_LEAN_AND_MEAN
128#define WIN32_LEAN_AND_MEAN
129#endif

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

461 * <PRE>
462 *
463 * void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
464 *
465 * </PRE>
466 */
467#define APR_THREAD_FUNC
468
122/* If windows.h was already included, our preferences don't matter.
123 * If not, include a restricted set of windows headers to our tastes.
124 */
125#ifndef _WINDOWS_
126
127#ifndef WIN32_LEAN_AND_MEAN
128#define WIN32_LEAN_AND_MEAN
129#endif

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

461 * <PRE>
462 *
463 * void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
464 *
465 * </PRE>
466 */
467#define APR_THREAD_FUNC
468
469#if defined(DOXYGEN) || !defined(WIN32)
470
469/**
470 * The public APR functions are declared with APR_DECLARE(), so they may
471 * use the most appropriate calling convention. Public APR functions with
472 * variable arguments must use APR_DECLARE_NONSTD().
473 *
474 * @remark Both the declaration and implementations must use the same macro.
475 *
476 * <PRE>

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

513 *
514 * extern APR_DECLARE_DATA type apr_variable;\n
515 * APR_DECLARE_DATA type apr_variable = value;
516 *
517 * </PRE>
518 */
519#define APR_DECLARE_DATA
520
471/**
472 * The public APR functions are declared with APR_DECLARE(), so they may
473 * use the most appropriate calling convention. Public APR functions with
474 * variable arguments must use APR_DECLARE_NONSTD().
475 *
476 * @remark Both the declaration and implementations must use the same macro.
477 *
478 * <PRE>

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

515 *
516 * extern APR_DECLARE_DATA type apr_variable;\n
517 * APR_DECLARE_DATA type apr_variable = value;
518 *
519 * </PRE>
520 */
521#define APR_DECLARE_DATA
522
523#elif defined(APR_DECLARE_STATIC)
524#define APR_DECLARE(type) type __stdcall
525#define APR_DECLARE_NONSTD(type) type __cdecl
526#define APR_DECLARE_DATA
527#elif defined(APR_DECLARE_EXPORT)
528#define APR_DECLARE(type) __declspec(dllexport) type __stdcall
529#define APR_DECLARE_NONSTD(type) __declspec(dllexport) type __cdecl
530#define APR_DECLARE_DATA __declspec(dllexport)
531#else
532#define APR_DECLARE(type) __declspec(dllimport) type __stdcall
533#define APR_DECLARE_NONSTD(type) __declspec(dllimport) type __cdecl
534#define APR_DECLARE_DATA __declspec(dllimport)
535#endif
536
521/* Define APR_SSIZE_T_FMT.
522 * If ssize_t is an integer we define it to be "d",
523 * if ssize_t is a long int we define it to be "ld",
524 * if ssize_t is neither we declare an error here.
525 * I looked for a better way to define this here, but couldn't find one, so
526 * to find the logic for this definition search for "ssize_t_fmt" in
527 * configure.in.
528 */

--- 116 unchanged lines hidden ---
537/* Define APR_SSIZE_T_FMT.
538 * If ssize_t is an integer we define it to be "d",
539 * if ssize_t is a long int we define it to be "ld",
540 * if ssize_t is neither we declare an error here.
541 * I looked for a better way to define this here, but couldn't find one, so
542 * to find the logic for this definition search for "ssize_t_fmt" in
543 * configure.in.
544 */

--- 116 unchanged lines hidden ---