upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 15:49:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Windows portability fixes for prev commit

Browse source
This commit is contained in:
Howard Chu 2013-05-30 15:33:59 -07:00
parent f207c50b15
commit d29b9600e6
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/liblmdb/lmdb.h
View file

@ -144,12 +144,14 @@ typedef int mdb_mode_t;
typedef mode_t mdb_mode_t; typedef mode_t mdb_mode_t;
#endif #endif
#ifndef _WIN32 /** An abstraction for a file handle.
/** An abstraction for a file handle.
* On POSIX systems file handles are small integers. On Windows * On POSIX systems file handles are small integers. On Windows
* they're opaque pointers. * they're opaque pointers.
*/ */
#define HANDLE int #ifdef _WIN32
typedef void *mdb_filehandle_t;
#else
typedef int mdb_filehandle_t;
#endif #endif
/** @defgroup mdb MDB API /** @defgroup mdb MDB API
@ -550,7 +552,7 @@ int mdb_env_copy(MDB_env *env, const char *path);
* have already been opened for Write access. * have already been opened for Write access.
* @return A non-zero error value on failure and 0 on success. * @return A non-zero error value on failure and 0 on success.
*/ */
int mdb_env_copyfd(MDB_env *env, HANDLE fd); int mdb_env_copyfd(MDB_env *env, mdb_filehandle_t fd);
/** @brief Return statistics about the MDB environment. /** @brief Return statistics about the MDB environment.
* *

8
libraries/liblmdb/mdb.c
View file

@ -199,6 +199,12 @@ mdb_sem_wait(sem_t *sem)
*/ */
#define ErrCode() errno #define ErrCode() errno
/** An abstraction for a file handle.
* On POSIX systems file handles are small integers. On Windows
* they're opaque pointers.
*/
#define HANDLE int
/** A value for an invalid file handle. /** A value for an invalid file handle.
* Mainly used to initialize file variables and signify that they are * Mainly used to initialize file variables and signify that they are
* unused. * unused.
@ -3625,7 +3631,7 @@ mdb_env_close0(MDB_env *env, int excl)
} }
int int
mdb_env_copyfd(MDB_env *env, int fd) mdb_env_copyfd(MDB_env *env, HANDLE fd)
{ {
MDB_txn *txn = NULL; MDB_txn *txn = NULL;
int rc; int rc;