mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
890e342594
openldap/include/ldap_cdefs.h

147 lines
4.3 KiB
C
Raw Normal View History

Add OpenLDAP RCS Id
1999-08-31 09:17:01 +08:00
/* $OpenLDAP$ */
Add OpenLDAP Copyright to headers
1998-12-29 03:51:35 +08:00
/*
Y2k copyright update
2000-05-13 10:25:54 +08:00
* Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
Add OpenLDAP Copyright to headers
1998-12-29 03:51:35 +08:00
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted only
* as authorized by the OpenLDAP Public License. A copy of this
* license is available at http://www.OpenLDAP.org/license.html or
* in file LICENSE in the top-level directory of the distribution.
*/
merged with autoconf branch
1998-10-25 09:41:42 +08:00
/* LDAP C Defines */
#ifndef _LDAP_CDEFS_H
#define _LDAP_CDEFS_H
Support old c_plusplus...
1999-07-14 02:41:00 +08:00
#if defined(__cplusplus) || defined(c_plusplus)
merged with autoconf branch
1998-10-25 09:41:42 +08:00
# define LDAP_BEGIN_DECL extern "C" {
# define LDAP_END_DECL }
#else
Add LDAP_DEBUG_DEPRECIATED to enable warnings when 'depreciated' interfaces are used. Added comments to ldap_cdefs.h
1998-12-24 04:01:15 +08:00
# define LDAP_BEGIN_DECL /* begin declarations */
# define LDAP_END_DECL /* end declarations */
merged with autoconf branch
1998-10-25 09:41:42 +08:00
#endif
Make that LDAP_NEEDS_PROTOTYPES... might as well use proper English
2000-06-20 06:20:36 +08:00
#if !defined(LDAP_NO_PROTOTYPES) && ( defined(LDAP_NEEDS_PROTOTYPES) || \
Support old c_plusplus...
1999-07-14 02:41:00 +08:00
defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus) )
Rework prototype ifdef to use __NO_PROTOTYPES and __NEED_PROTOTYPES to force no prototypes or require them. Remove _WIN32 clause. Will update portable.h.nt to define __NEED_PROTOTYPES.
1998-11-13 04:30:42 +08:00
merged with autoconf branch
1998-10-25 09:41:42 +08:00
/* ANSI C or C++ */
# define LDAP_P(protos) protos
# define LDAP_CONCAT1(x,y) x ## y
# define LDAP_CONCAT(x,y) LDAP_CONCAT1(x,y)
# define LDAP_STRING(x) #x /* stringify without expanding x */
# define LDAP_XSTRING(x) LDAP_STRING(x) /* expand x, then stringify */
Rework prototype ifdef to use __NO_PROTOTYPES and __NEED_PROTOTYPES to force no prototypes or require them. Remove _WIN32 clause. Will update portable.h.nt to define __NEED_PROTOTYPES.
1998-11-13 04:30:42 +08:00
Add LDAP_CONST macro for use within EXTERNAL headers such as <lber.h> and <ldap.h>. Note: This should not be used within the implementation itself as our "portable.h" mechanism provides Standard C vs. K&R "const" handling.
1999-05-04 05:10:35 +08:00
#ifndef LDAP_CONST
# define LDAP_CONST const
#endif
Rework prototype ifdef to use __NO_PROTOTYPES and __NEED_PROTOTYPES to force no prototypes or require them. Remove _WIN32 clause. Will update portable.h.nt to define __NEED_PROTOTYPES.
1998-11-13 04:30:42 +08:00
#else /* no prototypes */
merged with autoconf branch
1998-10-25 09:41:42 +08:00
/* traditional C */
# define LDAP_P(protos) ()
# define LDAP_CONCAT(x,y) x/**/y
# define LDAP_STRING(x) "x"
Rework prototype ifdef to use __NO_PROTOTYPES and __NEED_PROTOTYPES to force no prototypes or require them. Remove _WIN32 clause. Will update portable.h.nt to define __NEED_PROTOTYPES.
1998-11-13 04:30:42 +08:00
Add LDAP_CONST macro for use within EXTERNAL headers such as <lber.h> and <ldap.h>. Note: This should not be used within the implementation itself as our "portable.h" mechanism provides Standard C vs. K&R "const" handling.
1999-05-04 05:10:35 +08:00
#ifndef LDAP_CONST
# define LDAP_CONST /* no const */
#endif
Rework prototype ifdef to use __NO_PROTOTYPES and __NEED_PROTOTYPES to force no prototypes or require them. Remove _WIN32 clause. Will update portable.h.nt to define __NEED_PROTOTYPES.
1998-11-13 04:30:42 +08:00
#endif /* no prototypes */
Introduce and use LDAP_GCCATTR() = __attributes__() in gcc
1999-09-04 05:06:33 +08:00
#if (__GNUC__) * 1000 + (__GNUC_MINOR__) >= 2006
# define LDAP_GCCATTR(attrs) __attribute__(attrs)
#else
# define LDAP_GCCATTR(attrs)
#endif
Remove old DLL IMPORT/EXPORT macros
1999-12-19 03:49:13 +08:00
/* Support for NT dynamic libraries. */
Introduce and use LDAP_GCCATTR() = __attributes__() in gcc
1999-09-04 05:06:33 +08:00
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
/* LBER library */
#if defined(LBER_DECL) && defined(_WIN32)
# define LBER_F(type) extern __declspec(LBER_DECL) type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LBER_V(type) extern __declspec(LBER_DECL) type
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
#else
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LBER_F(type) extern type
# define LBER_V(type) extern type
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
#endif
/* LDAP library */
#if defined(LDAP_DECL) && defined(_WIN32)
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_F(type) extern __declspec(LDAP_DECL) type
# define LDAP_V(type) extern __declspec(LDAP_DECL) type
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
#else
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_F(type) extern type
# define LDAP_V(type) extern type
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
#endif
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
/*
* C library. Mingw32 links with the C run-time library by default,
* so the explicit definition of CSTATIC will keep dllimport from
* being defined.
*/
#if (defined(__MINGW32__) && !defined(CSTATIC) || \
defined(_WIN32) && defined(_DLL))
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
# define LDAP_LIBC_F(type) extern __declspec(dllimport) type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_LIBC_V(type) extern __declspec(dllimport) type
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
#else
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
# define LDAP_LIBC_F(type) extern type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_LIBC_V(type) extern type
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
#endif
merged with autoconf branch
1998-10-25 09:41:42 +08:00
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
/* AVL library */
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
#if defined(LDAP_AVL_DECL) && defined(_WIN32)
# define LDAP_AVL_F(type) extern __declspec(LDAP_AVL_DECL) type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_AVL_V(type) extern __declspec(LDAP_AVL_DECL) type
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
#else
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
# define LDAP_AVL_F(type) extern type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_AVL_V(type) extern type
Enable browsing info in MSVC debugging configurations. Toy with dllimport/dllexport stuff (think I'll leave the real dll work to somebody else). Added ldap_strdup() wrapper of ber_strdup().
1999-06-04 02:24:22 +08:00
#endif
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
/* LDBM library */
#if defined(LDAP_LDBM_DECL) && defined(_WIN32)
# define LDAP_LDBM_F(type) extern __declspec(LDAP_LDBM_DECL) type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_LDBM_V(type) extern __declspec(LDAP_LDBM_DECL) type
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
#else
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
# define LDAP_LDBM_F(type) extern type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_LDBM_V(type) extern type
Vienna Bulk Commit This commit includes many changes. All changes compile under NT but have not been tested under UNIX. A Summary of changes (likely incomplete): NT changes: Removed lint. Clean up configuration support for "Debug", "Release", "SDebug", and "SRelease" configurations. Share output directories for clients, libraries, and slapd. (maybe they should be combined further and moved to build/{,S}{Debug,Release}). Enable threading when _MT is defined. Enable debuging when _DEBUG is defined. Disable setting of NDEBUG under Release/SRelease. Asserts are disabled in <ac/assert.h> when LDAP_DEBUG is not defined. Added 'build/main.dsp' Master project. Removed non-slapd projects from slapd.dsp (see main.dsp). Removed replaced many uses of _WIN32 macro with feature based macros. ldap_cdefs.h changes #define LDAP_CONST const (see below) #define LDAP_F(type) LDAP_F_PRE type LDAP_F_POST To allow specifiers to be added before and after the type declaration. (For DLL handling) LBER/LDAP changes Namespace changes: s/lber_/ber_/ for here and there. s/NAME_ERROR/LDAP_NAME_ERROR/g Deleted NULLMSG and other NULL* macros for namespace reasons. "const" libraries. Installed headers (ie: lber.h, ldap.h) use LDAP_CONST macro. Normally set to 'const' when __STDC__. Can be set externally to enable/disable 'constification' of external interface. Internal interface always uses 'const'. Did not fix warnings in -lldif (in lieu of new LDIF parser). Added _ext API implementations (excepting search and bind). Need to implement ldap_int_get_controls() for reponses with controls. Added numberous assert() checks. LDAP_R _MT defines HAVE_NT_THREADS Added numberous assert() checks. Changed ldap_pthread_t back to unsigned long. Used cast to HANDLE in _join(). LDBM Replaced _WIN32 with HAVE_SYSLOG ud Added version string if MKVERSION is not defined. (MKVERSION needs to be set under UNIX). slapd Made connection sockbuf field a pointer to a sockbuf. This removed slap.h dependency on lber-int.h. lber-int.h now only included by those files needing to mess with the sockbuf. Used ber_* functions/macros to access sockbuf internals whenever possible. Added version string if MKVERSION is not defined. (MKVERSION needs to be set under UNIX). Removed FD_SET unsigned lint slapd/tools Used EXEEXT to added ".exe" to routines. Need to define EXEEXT under UNIX. ldappasswd Added ldappasswd.dsp. Ported to NT. Used getpid() to seed rand(). nt_debug Minor cleanup. Added "portable.h" include and used <ac/*.h> where appropriate. Added const to char* format argument.
1999-05-19 09:12:33 +08:00
#endif
merged with autoconf branch
1998-10-25 09:41:42 +08:00
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
/* LDIF library */
#if defined(LDAP_LDIF_DECL) && defined(_WIN32)
# define LDAP_LDIF_F(type) extern __declspec(LDAP_LDIF_DECL) type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_LDIF_V(type) extern __declspec(LDAP_LDIF_DECL) type
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
#else
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
# define LDAP_LDIF_F(type) extern type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_LDIF_V(type) extern type
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
#endif
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
/* LUNICODE library */
#if defined(LDAP_LUNICODE_DECL) && defined(_WIN32)
# define LDAP_LUNICODE_F(type) extern __declspec(LDAP_LUNICODE_DECL) type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_LUNICODE_V(type) extern __declspec(LDAP_LUNICODE_DECL) type
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
#else
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
# define LDAP_LUNICODE_F(type) extern type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_LUNICODE_V(type) extern type
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
#endif
/* LUTIL library */
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
#if defined(LDAP_LUTIL_DECL) && defined(_WIN32)
# define LDAP_LUTIL_F(type) extern __declspec(LDAP_LUTIL_DECL) type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_LUTIL_V(type) extern __declspec(LDAP_LUTIL_DECL) type
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
#else
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
# define LDAP_LUTIL_F(type) extern type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_LUTIL_V(type) extern type
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
#endif
Add ber_bvstr and ber_bvstrdup string to berval allocators.
1999-12-17 13:37:33 +08:00
/* SLAPD (as a module exporting symbols) */
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
#if defined(LDAP_SLAPD_DECL) && defined(_WIN32)
# define LDAP_SLAPD_F(type) extern __declspec(LDAP_SLAPD_DECL) type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_SLAPD_V(type) extern __declspec(LDAP_SLAPD_DECL) type
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
#else
Round one of LDAP_F() macro changes. In this round we rename macros into our namespace and limit use to headers. A subsequent round will add macros to separately handle forward declarations of variables from declaration of function prototypes. The last round will add additional macros for declaring actual variables and functions.
2000-06-19 03:48:07 +08:00
# define LDAP_SLAPD_F(type) extern type
Introduce LDAP_V() and friends
2000-06-20 11:53:12 +08:00
# define LDAP_SLAPD_V(type) extern type
Fixes for NT dynamic linking.
1999-11-28 07:40:08 +08:00
#endif
#endif /* _LDAP_CDEFS_H */
Reference in New Issue Copy Permalink