alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

configure: remove some header checks

Browse source 
do them using C++17's __has_include instead

* configure.ac: Do not check for sys/times.h,
valgrind/memcheck.h, and spawn.h.
* bin/common_trans.cc, spot/misc/fixpool.hh, spot/misc/mspool.hh,
spot/misc/timer.hh: Adjust to use __has_include instead.
This commit is contained in:
Alexandre Duret-Lutz 2022-03-02 17:37:25 +01:00
parent cdc89dad16
commit 6b88d6f35b
5 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bin/common_trans.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2015-2021 Laboratoire de Recherche et Développement
// Copyright (C) 2015-2022 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
@ -27,7 +27,8 @@
#include <sys/wait.h>
#include <fcntl.h>
#include <iomanip>
#ifdef HAVE_SPAWN_H
#if __has_include(<spawn.h>)
#define HAVE_SPAWN_H 1
#include <spawn.h>
#endif
#include <regex>

1
configure.ac
View file

@ -147,7 +147,6 @@ CHECK_ATOMIC
AX_CHECK_BUDDY
AC_CHECK_HEADERS([sys/times.h valgrind/memcheck.h spawn.h])
AC_CHECK_FUNCS([times kill alarm sigaction sched_getcpu])
oLIBS=$LIBS

12
spot/misc/fixpool.hh
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2011, 2015-2018, 2020 Laboratoire de Recherche et
// Copyright (C) 2011, 2015-2018, 2020, 2022 Laboratoire de Recherche et
// Développement de l'Epita (LRDE)
//
// This file is part of Spot, a model checking library.
@ -22,7 +22,9 @@
#include <spot/misc/common.hh>
#include <spot/misc/clz.hh>
#if SPOT_DEBUG && defined(HAVE_VALGRIND_MEMCHECK_H)
#if SPOT_DEBUG && __has_include(<valgrind/memcheck.h>)
#undef USES_MEMCHECK_H
#define USES_MEMCHECK_H 1
#include <valgrind/memcheck.h>
#endif
@ -90,7 +92,7 @@ namespace spot
// If we have free blocks available, return the first one.
if (f)
{
#if SPOT_DEBUG && defined(HAVE_VALGRIND_MEMCHECK_H)
#ifdef USES_MEMCHECK_H
if (Kind == pool_type::Safe)
{
VALGRIND_MALLOCLIKE_BLOCK(f, size_, 0, false);
@ -112,7 +114,7 @@ namespace spot
void* res = free_start_;
free_start_ += size_;
#if SPOT_DEBUG && defined(HAVE_VALGRIND_MEMCHECK_H)
#ifdef USES_MEMCHECK_H
if (Kind == pool_type::Safe)
{
VALGRIND_MALLOCLIKE_BLOCK(res, size_, 0, false);
@ -134,7 +136,7 @@ namespace spot
block_* b = reinterpret_cast<block_*>(ptr);
b->next = freelist_;
freelist_ = b;
#if SPOT_DEBUG && defined(HAVE_VALGRIND_MEMCHECK_H)
#ifdef USES_MEMCHECK_H
if (Kind == pool_type::Safe)
{
VALGRIND_FREELIKE_BLOCK(ptr, 0);

14
spot/misc/mspool.hh
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2011, 2013, 2015, 2016, 2018 Laboratoire de Recherche et
// Developpement de l'Epita (LRDE)
// Copyright (C) 2011, 2013, 2015-2016, 2018, 2022 Laboratoire de
// Recherche et Developpement de l'Epita (LRDE)
//
// This file is part of Spot, a model checking library.
//
@ -22,7 +22,9 @@
#include <spot/misc/common.hh>
#include <unordered_map>
#if SPOT_DEBUG && defined(HAVE_VALGRIND_MEMCHECK_H)
#if SPOT_DEBUG && __has_include(<valgrind/memcheck.h>)
#undef USES_MEMCHECK_H
#define USES_MEMCHECK_H 1
#include <valgrind/memcheck.h>
#endif
@ -70,7 +72,7 @@ namespace spot
if (f)
{
block_* first = f;
#if SPOT_DEBUG && defined(HAVE_VALGRIND_MEMCHECK_H)
#ifdef USES_MEMCHECK_H
VALGRIND_MALLOCLIKE_BLOCK(f, size, 0, false);
// field f->next is initialized: prevents valgrind from complaining
// about jumps depending on uninitialized memory
@ -99,7 +101,7 @@ namespace spot
void* res = free_start_;
free_start_ += size;
#if SPOT_DEBUG && defined(HAVE_VALGRIND_MEMCHECK_H)
#ifdef USES_MEMCHECK_H
VALGRIND_MALLOCLIKE_BLOCK(res, size, 0, false);
#endif
return res;
@ -123,7 +125,7 @@ namespace spot
block_*& f = freelist_[size];
b->next = f;
f = b;
#if SPOT_DEBUG && defined(HAVE_VALGRIND_MEMCHECK_H)
#ifdef USES_MEMCHECK_H
VALGRIND_FREELIKE_BLOCK(ptr, 0);
#endif
}

4
spot/misc/timer.hh
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2009, 2011, 2012, 2013, 2014, 2015, 2016 Laboratoire de
// Copyright (C) 2009, 2011, 2012, 2013, 2014, 2015, 2016, 2022 Laboratoire de
// Recherche et Développement de l'Epita (LRDE).
// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
@ -29,7 +29,7 @@
#include <string>
#include <map>
#include <chrono>
#if SPOT_HAVE_SYS_TIMES_H
#if __has_include(<sys/times.h>)
# include <sys/times.h>
#endif
#include <ctime>