Move NAME_MAX and PATH_MAX from isc/platform.h to isc/dir.h

The last remaining defines needed for platforms without NAME_MAX and
PATH_MAX (I'm looking at you, GNU Hurd) were moved to isc/dir.h where
it's prevalently used.
This commit is contained in:
Ondřej Surý 2021-06-10 08:14:57 +02:00 committed by Ondřej Surý
parent 4da0c49e80
commit bf4a0e26dc
13 changed files with 21 additions and 22 deletions

View file

@ -19,6 +19,7 @@
#include <isc/app.h>
#include <isc/attributes.h>
#include <isc/dir.h>
#include <isc/netaddr.h>
#include <isc/parseint.h>
#include <isc/platform.h>

View file

@ -24,6 +24,7 @@
#include <isc/attributes.h>
#include <isc/buffer.h>
#include <isc/commandline.h>
#include <isc/dir.h>
#include <isc/file.h>
#include <isc/hash.h>
#include <isc/mem.h>

View file

@ -18,6 +18,7 @@
#include <isc/attributes.h>
#include <isc/buffer.h>
#include <isc/commandline.h>
#include <isc/dir.h>
#include <isc/hash.h>
#include <isc/mem.h>
#include <isc/print.h>

View file

@ -36,6 +36,7 @@
#include <isc/attributes.h>
#include <isc/base32.h>
#include <isc/commandline.h>
#include <isc/dir.h>
#include <isc/event.h>
#include <isc/file.h>
#include <isc/hash.h>

View file

@ -15,6 +15,7 @@
#include <maxminddb.h>
#endif /* if defined(HAVE_GEOIP2) */
#include <isc/dir.h>
#include <isc/print.h>
#include <isc/string.h>
#include <isc/util.h>

View file

@ -13,6 +13,7 @@
#include <stddef.h>
#include <stdint.h>
#include <isc/dir.h>
#include <isc/lang.h>
#include <isc/mem.h>
#include <isc/once.h>

View file

@ -23,6 +23,7 @@
#include <isc/aes.h>
#include <isc/base64.h>
#include <isc/buffer.h>
#include <isc/dir.h>
#include <isc/file.h>
#include <isc/hex.h>
#include <isc/log.h>

View file

@ -15,6 +15,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <isc/dir.h>
#include <isc/file.h>
#include <isc/mem.h>
#include <isc/print.h>

View file

@ -24,6 +24,7 @@
#include <cmocka.h>
#include <maxminddb.h>
#include <isc/dir.h>
#include <isc/print.h>
#include <isc/string.h>
#include <isc/types.h>

View file

@ -20,6 +20,7 @@
#endif /* ifdef HAVE_LMDB */
#include <isc/atomic.h>
#include <isc/dir.h>
#include <isc/file.h>
#include <isc/hash.h>
#include <isc/lex.h>

View file

@ -9,12 +9,12 @@
* information regarding copyright ownership.
*/
#ifndef ISC_DIR_H
#define ISC_DIR_H 1
#pragma once
/*! \file */
#include <dirent.h>
#include <limits.h>
#include <isc/lang.h>
#include <isc/platform.h>
@ -22,6 +22,14 @@
#include <sys/types.h> /* Required on some systems. */
#ifndef NAME_MAX
#define NAME_MAX 256
#endif
#ifndef PATH_MAX
#define PATH_MAX 1024
#endif
/*% Directory Entry */
typedef struct isc_direntry {
char name[NAME_MAX];
@ -69,5 +77,3 @@ isc_dir_createunique(char *templet);
*/
ISC_LANG_ENDDECLS
#endif /* ISC_DIR_H */

View file

@ -18,24 +18,6 @@
***** Platform-dependent defines.
*****/
/***
*** System limitations
***/
#include <limits.h>
#ifndef NAME_MAX
#define NAME_MAX 256
#endif
#ifndef PATH_MAX
#define PATH_MAX 1024
#endif
#ifndef IOV_MAX
#define IOV_MAX 1024
#endif
/*
* Tell emacs to use C mode for this file.
*

View file

@ -24,6 +24,7 @@
#include <cmocka.h>
#include <isc/attributes.h>
#include <isc/dir.h>
#include <isc/mem.h>
#include <isc/platform.h>
#include <isc/result.h>