#endif
#include <sys/types.h>
#include <sys/stat.h>
+#if HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include "pazpar2_config.h"
#include "settings.h"
#include "eventl.h"
}
else
{
- if (S_ISREG(st.st_mode))
+ if ((st.st_mode & S_IFMT) == S_IFREG)
{
xmlDoc *doc = xmlParseFile(path);
yaz_log(YLOG_LOG, "processing include path=%s", path);
}
}
-void config_read_settings(struct conf_config *config,
- const char *path_override)
+void config_read_settings(struct conf_config *config)
{
struct conf_service *s = config->servers->service;
for (;s ; s = s->next)
{
init_settings(s);
- if (path_override)
- settings_read(s, path_override);
- else if (s->settings)
+ if (s->settings)
settings_read(s, s->settings);
else if (config->servers->server_settings)
settings_read(s, config->servers->server_settings);