From cd2e3d1f54cc957a624b4186fcb9de2349a33163 Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Wed, 16 Nov 2022 13:04:05 +0100 Subject: [PATCH] ldap: Don't depend on the getopt.h header. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53930 --- libs/ldap/include/getopt-compat.h | 40 +++++++++++++++++++++++++++++++ libs/ldap/include/portable.h | 4 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 libs/ldap/include/getopt-compat.h diff --git a/libs/ldap/include/getopt-compat.h b/libs/ldap/include/getopt-compat.h new file mode 100644 index 00000000000..3bbc1e40d8b --- /dev/null +++ b/libs/ldap/include/getopt-compat.h @@ -0,0 +1,40 @@ +/* getopt-compat.h -- getopt(3) compatibility header */ +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2022 The OpenLDAP Foundation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ + +/* + * getopt(3) declarations + */ +#ifndef _GETOPT_COMPAT_H +#define _GETOPT_COMPAT_H + +#include + +LDAP_BEGIN_DECL + +/* change symbols to avoid clashing */ +#define optarg lutil_optarg +#define optind lutil_optind +#define opterr lutil_opterr +#define optopt lutil_optopt +#define getopt lutil_getopt + +LDAP_LUTIL_V (char *) optarg; +LDAP_LUTIL_V (int) optind, opterr, optopt; +LDAP_LUTIL_F (int) getopt LDAP_P(( int, char * const [], const char *)); + +LDAP_END_DECL + +#endif /* _GETOPT_COMPAT_H */ diff --git a/libs/ldap/include/portable.h b/libs/ldap/include/portable.h index 196b4a533ae..d3867575fca 100644 --- a/libs/ldap/include/portable.h +++ b/libs/ldap/include/portable.h @@ -211,10 +211,10 @@ #define HAVE_GETNAMEINFO 1 /* Define to 1 if you have the `getopt' function. */ -#define HAVE_GETOPT 1 +/* #undef HAVE_GETOPT */ /* Define to 1 if you have the header file. */ -#define HAVE_GETOPT_H 1 +/* #undef HAVE_GETOPT_H */ /* Define to 1 if you have the `getpassphrase' function. */ /* #undef HAVE_GETPASSPHRASE */