Skip to content

Fix compilation with c23 #63 #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamdickmeiss merged 1 commit into from
Feb 17, 2025
Merged

Fix compilation with c23 #63 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ AC_CONFIG_HEADERS([include/config.h])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([1.9])
AC_DEFINE([_POSIX_C_SOURCE],[200809L],[Enable POSIX])
PACKAGE_SUFFIX="-2.0"
AC_SUBST(PACKAGE_SUFFIX)
dnl https://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
Expand Down
2 changes: 1 addition & 1 deletion index/zebraapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ void map_basenames_func(void *vp, const char *name, const char *value)
return ;
no--;
for (i = 0; i<p->num_bases; i++)
if (p->basenames[i] && !STRCASECMP(p->basenames[i], fromdb))
if (p->basenames[i] && !yaz_strcasecmp(p->basenames[i], fromdb))
{
p->basenames[i] = 0;
for (i = 0; i < no; i++)
Expand Down
6 changes: 3 additions & 3 deletions index/zinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,11 +799,11 @@ int zebraExplain_curDatabase(ZebraExplainInfo zei, const char *database)

assert(zei);
if (zei->curDatabaseInfo &&
!STRCASECMP(zei->curDatabaseInfo->databaseName, database))
!yaz_strcasecmp(zei->curDatabaseInfo->databaseName, database))
return 0;
for (zdi = zei->databaseInfo; zdi; zdi=zdi->next)
{
if (!STRCASECMP(zdi->databaseName, database_n))
if (!yaz_strcasecmp(zdi->databaseName, database_n))
break;
}
if (!zdi)
Expand Down Expand Up @@ -897,7 +897,7 @@ int zebraExplain_newDatabase(ZebraExplainInfo zei, const char *database,
assert(zei);
for (zdi = zei->databaseInfo; zdi; zdi=zdi->next)
{
if (!STRCASECMP(zdi->databaseName, database_n))
if (!yaz_strcasecmp(zdi->databaseName, database_n))
break;
}
if (zdi)
Expand Down
7 changes: 0 additions & 7 deletions index/zinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <idzebra/api.h>
#include "recindex.h"

/* Compare string (ignore case) */
#ifdef WIN32
#define STRCASECMP stricmp
#else
#define STRCASECMP strcasecmp
#endif

YAZ_BEGIN_CDECL

typedef enum {
Expand Down