Mercurial > irccd

changeset 762:28f493661157

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Misc: prefix all macros with IRCCD_
author David Demelier <markand@malikania.fr>
date Sun, 12 Aug 2018 09:40:36 +0200
parents f25c878d823b
children 4283dc118339
files cmake/IrccdSystem.cmake cmake/check/PutTime.cmake cmake/internal/sysconfig.hpp.in libirccd-core/irccd/string_util.cpp libirccd-core/irccd/system.cpp libirccd-core/irccd/system.hpp libirccd-js/irccd/js/file_js_api.cpp libirccd-js/irccd/js/file_js_api.hpp libirccd-js/irccd/js/system_js_api.cpp libirccd/irccd/daemon/irccd.cpp libirccd/irccd/daemon/logger.cpp libirccd/irccd/daemon/logger.hpp tests/src/libirccd-js/js-api-system/main.cpp
diffstat 13 files changed, 150 insertions(+), 150 deletions(-) [+]
line wrap: on
line diff
--- a/cmake/IrccdSystem.cmake	Sat Aug 11 21:49:09 2018 +0200
+++ b/cmake/IrccdSystem.cmake	Sun Aug 12 09:40:36 2018 +0200
@@ -77,113 +77,109 @@
 # -------------------------------------------------------------------
 #
 
-check_type_size(int8_t HAVE_INT8)
-check_type_size(uint8_t HAVE_UINT8)
-check_type_size(int16_t HAVE_INT16)
-check_type_size(uint16_t HAVE_UINT16)
-check_type_size(int32_t HAVE_INT32)
-check_type_size(uint32_t HAVE_UINT32)
-check_type_size(int64_t HAVE_INT64)
-check_type_size(uint64_t HAVE_UINT64)
-
-if (NOT HAVE_STDINT_H)
-    message("irccd requires stdint.h or cstdint header")
-endif ()
+check_type_size(int8_t IRCCD_HAVE_INT8)
+check_type_size(uint8_t IRCCD_HAVE_UINT8)
+check_type_size(int16_t IRCCD_HAVE_INT16)
+check_type_size(uint16_t IRCCD_HAVE_UINT16)
+check_type_size(int32_t IRCCD_HAVE_INT32)
+check_type_size(uint32_t IRCCD_HAVE_UINT32)
+check_type_size(int64_t IRCCD_HAVE_INT64)
+check_type_size(uint64_t IRCCD_HAVE_UINT64)
 
 #
 # Where any of these function / feature is required, include the <irccd/sysconfig.h> file.
 #
 # The following variables are defined in irccd/sysconfig.h
 #
-# HAVE_GETLOGIN         True if getlogin(3) function (and unistd.h)
-# HAVE_POPEN            True if has popen(3) function (in stdio.h)
-# HAVE_SETPROGNAME      True if setprogname(3) is available from C library,
-# HAVE_STAT             True if has stat(2) function (and sys/types.h and sys/stat.h),
-# HAVE_STAT_ST_DEV      The struct stat has st_dev field,
-# HAVE_STAT_ST_INO      The struct stat has st_ino field,
-# HAVE_STAT_ST_NLINK    The struct stat has st_nlink field,
-# HAVE_STAT_ST_UID      The struct stat has st_uid field,
-# HAVE_STAT_ST_GID      The struct stat has st_gid field,
-# HAVE_STAT_ST_ATIME    The struct stat has st_atime field,
-# HAVE_STAT_ST_MTIME    The struct stat has st_mtime field,
-# HAVE_STAT_ST_CTIME    The struct stat has st_ctime field,
-# HAVE_STAT_ST_SIZE     The struct stat has st_size field,
-# HAVE_STAT_ST_BLKSIZE  The struct stat has st_blksize field,
-# HAVE_STAT_ST_BLOCKS   The struct stat has st_blocks field,
-# HAVE_SYSLOG           True if syslog functions are available (and syslog.h),
+# IRCCD_HAVE_GETLOGIN           True if getlogin(3) function (and unistd.h)
+# IRCCD_HAVE_POPEN              True if has popen(3) function (in stdio.h)
+# IRCCD_HAVE_SETPROGNAME        True if setprogname(3) is available from C library,
+# IRCCD_HAVE_STAT               True if has stat(2) function (and sys/types.h and sys/stat.h),
+# IRCCD_HAVE_STAT_ST_DEV        The struct stat has st_dev field,
+# IRCCD_HAVE_STAT_ST_INO        The struct stat has st_ino field,
+# IRCCD_HAVE_STAT_ST_NLINK      The struct stat has st_nlink field,
+# IRCCD_HAVE_STAT_ST_UID        The struct stat has st_uid field,
+# IRCCD_HAVE_STAT_ST_GID        The struct stat has st_gid field,
+# IRCCD_HAVE_STAT_ST_ATIME      The struct stat has st_atime field,
+# IRCCD_HAVE_STAT_ST_MTIME      The struct stat has st_mtime field,
+# IRCCD_HAVE_STAT_ST_CTIME      The struct stat has st_ctime field,
+# IRCCD_HAVE_STAT_ST_SIZE       The struct stat has st_size field,
+# IRCCD_HAVE_STAT_ST_BLKSIZE    The struct stat has st_blksize field,
+# IRCCD_HAVE_STAT_ST_BLOCKS     The struct stat has st_blocks field,
+# IRCCD_HAVE_SYSLOG             True if syslog functions are available (and syslog.h),
 #
 
 # Check for unistd.h
-check_include_file(unistd.h HAVE_UNISTD_H)
+check_include_file(unistd.h IRCCD_HAVE_UNISTD_H)
 
 # Check for sys/types.h
-check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+check_include_file(sys/types.h IRCCD_HAVE_SYS_TYPES_H)
 
 # Check of setprogname(3) function, include:
 #
 # #include <cstdlib>
-check_function_exists(setprogname HAVE_SETPROGNAME)
+check_function_exists(setprogname IRCCD_HAVE_SETPROGNAME)
 
 # getlogin() function
 #
-# If HAVE_GETLOGIN is defined, include:
+# If IRCCD_HAVE_GETLOGIN is defined, include:
 #
 # #include <unistd.h>
-check_function_exists(getlogin HAVE_GETLOGIN)
+check_function_exists(getlogin IRCCD_HAVE_GETLOGIN)
 
-if (NOT HAVE_UNISTD_H)
-    set(HAVE_GETLOGIN FALSE)
+if (NOT IRCCD_HAVE_UNISTD_H)
+    set(IRCCD_HAVE_GETLOGIN FALSE)
 endif ()
 
 # popen() function
 #
-# If HAVE_POPEN is defined, include;
+# If IRCCD_HAVE_POPEN is defined, include;
 #
 # #include <cstdio>
-check_function_exists(popen HAVE_POPEN)
+check_function_exists(popen IRCCD_HAVE_POPEN)
 
 # stat(2) function
 #
-# If HAVE_STAT is defined, include:
+# If IRCCD_HAVE_STAT is defined, include:
 #
 # #include <sys/types.h>
 # #include <sys/stat.h>
-check_include_file(sys/stat.h HAVE_SYS_STAT_H)
-check_function_exists(stat HAVE_STAT)
+check_include_file(sys/stat.h IRCCD_HAVE_SYS_STAT_H)
+check_function_exists(stat IRCCD_HAVE_STAT)
 
 # If the sys/stat.h is not found, we disable stat(2)
-if (NOT HAVE_SYS_STAT_H OR NOT HAVE_SYS_TYPES_H)
-    set(HAVE_STAT FALSE)
+if (NOT IRCCD_HAVE_SYS_STAT_H OR NOT IRCCD_HAVE_SYS_TYPES_H)
+    set(IRCCD_HAVE_STAT FALSE)
 endif ()
 
 # syslog functions
 #
-# If HAVE_SYSLOG is defined, include:
+# If IRCCD_HAVE_SYSLOG is defined, include:
 #
 # #include <syslog.h>
-check_include_file(syslog.h HAVE_SYSLOG_H)
-check_function_exists(openlog HAVE_OPENLOG)
-check_function_exists(syslog HAVE_SYSLOG)
-check_function_exists(closelog HAVE_CLOSELOG)
+check_include_file(syslog.h IRCCD_HAVE_SYSLOG_H)
+check_function_exists(openlog IRCCD_HAVE_OPENLOG)
+check_function_exists(syslog IRCCD_HAVE_SYSLOG)
+check_function_exists(closelog IRCCD_HAVE_CLOSELOG)
 
-if (NOT HAVE_SYSLOG_H OR NOT HAVE_OPENLOG OR NOT HAVE_CLOSELOG)
-    set(HAVE_SYSLOG FALSE)
+if (NOT IRCCD_HAVE_SYSLOG_H OR NOT IRCCD_HAVE_OPENLOG OR NOT IRCCD_HAVE_CLOSELOG)
+    set(IRCCD_HAVE_SYSLOG FALSE)
 endif ()
 
 # Check for struct stat fields.
-check_struct_has_member("struct stat" st_atime sys/stat.h HAVE_STAT_ST_ATIME)
-check_struct_has_member("struct stat" st_blksize sys/stat.h HAVE_STAT_ST_BLKSIZE)
-check_struct_has_member("struct stat" st_blocks sys/stat.h HAVE_STAT_ST_BLOCKS)
-check_struct_has_member("struct stat" st_ctime sys/stat.h HAVE_STAT_ST_CTIME)
-check_struct_has_member("struct stat" st_dev sys/stat.h HAVE_STAT_ST_DEV)
-check_struct_has_member("struct stat" st_gid sys/stat.h HAVE_STAT_ST_GID)
-check_struct_has_member("struct stat" st_ino sys/stat.h HAVE_STAT_ST_INO)
-check_struct_has_member("struct stat" st_mode sys/stat.h HAVE_STAT_ST_MODE)
-check_struct_has_member("struct stat" st_mtime sys/stat.h HAVE_STAT_ST_MTIME)
-check_struct_has_member("struct stat" st_nlink sys/stat.h HAVE_STAT_ST_NLINK)
-check_struct_has_member("struct stat" st_rdev sys/stat.h HAVE_STAT_ST_RDEV)
-check_struct_has_member("struct stat" st_size sys/stat.h HAVE_STAT_ST_SIZE)
-check_struct_has_member("struct stat" st_uid sys/stat.h HAVE_STAT_ST_UID)
+check_struct_has_member("struct stat" st_atime sys/stat.h IRCCD_HAVE_STAT_ST_ATIME)
+check_struct_has_member("struct stat" st_blksize sys/stat.h IRCCD_HAVE_STAT_ST_BLKSIZE)
+check_struct_has_member("struct stat" st_blocks sys/stat.h IRCCD_HAVE_STAT_ST_BLOCKS)
+check_struct_has_member("struct stat" st_ctime sys/stat.h IRCCD_HAVE_STAT_ST_CTIME)
+check_struct_has_member("struct stat" st_dev sys/stat.h IRCCD_HAVE_STAT_ST_DEV)
+check_struct_has_member("struct stat" st_gid sys/stat.h IRCCD_HAVE_STAT_ST_GID)
+check_struct_has_member("struct stat" st_ino sys/stat.h IRCCD_HAVE_STAT_ST_INO)
+check_struct_has_member("struct stat" st_mode sys/stat.h IRCCD_HAVE_STAT_ST_MODE)
+check_struct_has_member("struct stat" st_mtime sys/stat.h IRCCD_HAVE_STAT_ST_MTIME)
+check_struct_has_member("struct stat" st_nlink sys/stat.h IRCCD_HAVE_STAT_ST_NLINK)
+check_struct_has_member("struct stat" st_rdev sys/stat.h IRCCD_HAVE_STAT_ST_RDEV)
+check_struct_has_member("struct stat" st_size sys/stat.h IRCCD_HAVE_STAT_ST_SIZE)
+check_struct_has_member("struct stat" st_uid sys/stat.h IRCCD_HAVE_STAT_ST_UID)
 
 # Configuration file.
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/irccd)
--- a/cmake/check/PutTime.cmake	Sat Aug 11 21:49:09 2018 +0200
+++ b/cmake/check/PutTime.cmake	Sun Aug 12 09:40:36 2018 +0200
@@ -32,5 +32,5 @@
         return 0;
      }
     "
-    HAVE_STD_PUT_TIME
+    IRCCD_HAVE_STD_PUT_TIME
 )
--- a/cmake/internal/sysconfig.hpp.in	Sat Aug 11 21:49:09 2018 +0200
+++ b/cmake/internal/sysconfig.hpp.in	Sun Aug 12 09:40:36 2018 +0200
@@ -34,28 +34,30 @@
 #   include <windows.h>
 #endif
 
+namespace irccd {
+
 /*
  * Auto generated from CMake.
  * ------------------------------------------------------------------
  */
 
-#define IRCCD_VERSION_MAJOR     @IRCCD_VERSION_MAJOR@
-#define IRCCD_VERSION_MINOR     @IRCCD_VERSION_MINOR@
-#define IRCCD_VERSION_PATCH     @IRCCD_VERSION_PATCH@
-#define IRCCD_VERSION_SHLIB     @IRCCD_VERSION_SHLIB@
-#define IRCCD_VERSION           "@IRCCD_VERSION@"
+#define IRCCD_VERSION_MAJOR         @IRCCD_VERSION_MAJOR@
+#define IRCCD_VERSION_MINOR         @IRCCD_VERSION_MINOR@
+#define IRCCD_VERSION_PATCH         @IRCCD_VERSION_PATCH@
+#define IRCCD_VERSION_SHLIB         @IRCCD_VERSION_SHLIB@
+#define IRCCD_VERSION               "@IRCCD_VERSION@"
 
 /*
  * User definable options.
  * ------------------------------------------------------------------
  */
 
-#define CMAKE_INSTALL_PREFIX        "@CMAKE_INSTALL_PREFIX@"
-#define CMAKE_INSTALL_LOCALSTATEDIR "@CMAKE_INSTALL_LOCALSTATEDIR@"
-#define CMAKE_INSTALL_DATADIR       "@CMAKE_INSTALL_DATADIR@"
-#define CMAKE_INSTALL_BINDIR        "@CMAKE_INSTALL_BINDIR@"
-#define CMAKE_INSTALL_LIBDIR        "@CMAKE_INSTALL_LIBDIR@"
-#define CMAKE_INSTALL_SYSCONFDIR    "@CMAKE_INSTALL_SYSCONFDIR@"
+#define IRCCD_INSTALL_PREFIX        "@CMAKE_INSTALL_PREFIX@"
+#define IRCCD_INSTALL_LOCALSTATEDIR "@CMAKE_INSTALL_LOCALSTATEDIR@"
+#define IRCCD_INSTALL_DATADIR       "@CMAKE_INSTALL_DATADIR@"
+#define IRCCD_INSTALL_BINDIR        "@CMAKE_INSTALL_BINDIR@"
+#define IRCCD_INSTALL_LIBDIR        "@CMAKE_INSTALL_LIBDIR@"
+#define IRCCD_INSTALL_SYSCONFDIR    "@CMAKE_INSTALL_SYSCONFDIR@"
 
 #cmakedefine IRCCD_HAVE_JS
 #cmakedefine IRCCD_HAVE_SSL
@@ -66,34 +68,36 @@
  * ------------------------------------------------------------------
  */
 
-#cmakedefine HAVE_GETLOGIN
-#cmakedefine HAVE_POPEN
-#cmakedefine HAVE_SETPROGNAME
-#cmakedefine HAVE_STAT
-#cmakedefine HAVE_STAT_ST_ATIME
-#cmakedefine HAVE_STAT_ST_BLKSIZE
-#cmakedefine HAVE_STAT_ST_BLOCKS
-#cmakedefine HAVE_STAT_ST_CTIME
-#cmakedefine HAVE_STAT_ST_DEV
-#cmakedefine HAVE_STAT_ST_GID
-#cmakedefine HAVE_STAT_ST_INO
-#cmakedefine HAVE_STAT_ST_MODE
-#cmakedefine HAVE_STAT_ST_MTIME
-#cmakedefine HAVE_STAT_ST_NLINK
-#cmakedefine HAVE_STAT_ST_RDEV
-#cmakedefine HAVE_STAT_ST_SIZE
-#cmakedefine HAVE_STAT_ST_UID
-#cmakedefine HAVE_STD_PUT_TIME
-#cmakedefine HAVE_SYSLOG
+#cmakedefine IRCCD_HAVE_GETLOGIN
+#cmakedefine IRCCD_HAVE_POPEN
+#cmakedefine IRCCD_HAVE_SETPROGNAME
+#cmakedefine IRCCD_HAVE_STAT
+#cmakedefine IRCCD_HAVE_STAT_ST_ATIME
+#cmakedefine IRCCD_HAVE_STAT_ST_BLKSIZE
+#cmakedefine IRCCD_HAVE_STAT_ST_BLOCKS
+#cmakedefine IRCCD_HAVE_STAT_ST_CTIME
+#cmakedefine IRCCD_HAVE_STAT_ST_DEV
+#cmakedefine IRCCD_HAVE_STAT_ST_GID
+#cmakedefine IRCCD_HAVE_STAT_ST_INO
+#cmakedefine IRCCD_HAVE_STAT_ST_MODE
+#cmakedefine IRCCD_HAVE_STAT_ST_MTIME
+#cmakedefine IRCCD_HAVE_STAT_ST_NLINK
+#cmakedefine IRCCD_HAVE_STAT_ST_RDEV
+#cmakedefine IRCCD_HAVE_STAT_ST_SIZE
+#cmakedefine IRCCD_HAVE_STAT_ST_UID
+#cmakedefine IRCCD_HAVE_STD_PUT_TIME
+#cmakedefine IRCCD_HAVE_SYSLOG
 
 /**
  * \brief Describe irccd version.
  */
 struct version {
-    unsigned major{IRCCD_VERSION_MAJOR};    //!< major
-    unsigned minor{IRCCD_VERSION_MINOR};    //!< minor
-    unsigned patch{IRCCD_VERSION_PATCH};    //!< patch
-    unsigned abi{IRCCD_VERSION_SHLIB};      //!< ABI compatibility
+    const unsigned major{IRCCD_VERSION_MAJOR};  //!< major
+    const unsigned minor{IRCCD_VERSION_MINOR};  //!< minor
+    const unsigned patch{IRCCD_VERSION_PATCH};  //!< patch
+    const unsigned abi{IRCCD_VERSION_SHLIB};    //!< ABI compatibility
 };
 
+} // !irccd
+
 #endif // !IRCCD_SYSCONFIG_HPP
--- a/libirccd-core/irccd/string_util.cpp	Sat Aug 11 21:49:09 2018 +0200
+++ b/libirccd-core/irccd/string_util.cpp	Sun Aug 12 09:40:36 2018 +0200
@@ -20,7 +20,7 @@
 
 #include "sysconfig.hpp"
 
-#if defined(HAVE_POPEN)
+#if defined(IRCCD_HAVE_POPEN)
 #   include <array>
 #   include <cerrno>
 #   include <cstring>
@@ -103,7 +103,7 @@
 {
     std::ostringstream oss;
 
-#if defined(HAVE_STD_PUT_TIME)
+#if defined(IRCCD_HAVE_STD_PUT_TIME)
     oss << std::put_time(std::localtime(&params.time), text.c_str());
 #else
     /*
@@ -240,7 +240,7 @@
 
 std::string subst_shell(const std::string& command)
 {
-#if defined(HAVE_POPEN)
+#if defined(IRCCD_HAVE_POPEN)
     std::unique_ptr<FILE, std::function<int (FILE*)>> fp(popen(command.c_str(), "r"), pclose);
 
     if (fp == nullptr)
--- a/libirccd-core/irccd/system.cpp	Sat Aug 11 21:49:09 2018 +0200
+++ b/libirccd-core/irccd/system.cpp	Sun Aug 12 09:40:36 2018 +0200
@@ -50,7 +50,7 @@
 #   include <libproc.h>
 #endif
 
-#if defined(HAVE_GETLOGIN)
+#if defined(IRCCD_HAVE_GETLOGIN)
 #   include <unistd.h>
 #endif
 
@@ -77,8 +77,8 @@
  */
 auto base_directory() -> boost::filesystem::path
 {
-    static const boost::filesystem::path bindir(CMAKE_INSTALL_BINDIR);
-    static const boost::filesystem::path prefix(CMAKE_INSTALL_PREFIX);
+    static const boost::filesystem::path bindir(IRCCD_INSTALL_BINDIR);
+    static const boost::filesystem::path prefix(IRCCD_INSTALL_PREFIX);
 
     boost::filesystem::path path(".");
 
@@ -216,7 +216,7 @@
 
 void set_program_name(std::string name) noexcept
 {
-#if defined(HAVE_SETPROGNAME)
+#if defined(IRCCD_HAVE_SETPROGNAME)
     static std::string save = name;
 
     setprogname(save.c_str());
@@ -412,7 +412,7 @@
 
 auto cachedir() -> boost::filesystem::path
 {
-    return system_directory(CMAKE_INSTALL_LOCALSTATEDIR) / "cache/irccd";
+    return system_directory(IRCCD_INSTALL_LOCALSTATEDIR) / "cache/irccd";
 }
 
 // }}}
@@ -421,7 +421,7 @@
 
 auto datadir() -> boost::filesystem::path
 {
-    return system_directory(CMAKE_INSTALL_DATADIR);
+    return system_directory(IRCCD_INSTALL_DATADIR);
 }
 
 // }}}
@@ -430,7 +430,7 @@
 
 auto sysconfdir() -> boost::filesystem::path
 {
-    return system_directory(CMAKE_INSTALL_SYSCONFDIR) / "irccd";
+    return system_directory(IRCCD_INSTALL_SYSCONFDIR) / "irccd";
 }
 
 // }}}
@@ -439,7 +439,7 @@
 
 auto plugindir() -> boost::filesystem::path
 {
-    return system_directory(CMAKE_INSTALL_LIBDIR) / "irccd";
+    return system_directory(IRCCD_INSTALL_LIBDIR) / "irccd";
 }
 
 // }}}
@@ -452,7 +452,7 @@
  */
 auto username() -> std::string
 {
-#if defined(HAVE_GETLOGIN)
+#if defined(IRCCD_HAVE_GETLOGIN)
     auto v = getlogin();
 
     if (v)
--- a/libirccd-core/irccd/system.hpp	Sat Aug 11 21:49:09 2018 +0200
+++ b/libirccd-core/irccd/system.hpp	Sun Aug 12 09:40:36 2018 +0200
@@ -90,7 +90,7 @@
 
 /**
  * Get the cache directory as specified as compile time option
- * CMAKE_INSTALL_LOCALSTATEDIR, if the value is absolute, it is returned as-is.
+ * IRCCD_INSTALL_LOCALSTATEDIR, if the value is absolute, it is returned as-is.
  *
  * If the component is relative, it is evaluated using the binary executable
  * path.
@@ -102,7 +102,7 @@
 auto cachedir() -> boost::filesystem::path;
 
 /**
- * Like cachedir but for CMAKE_INSTALL_DATADIR.
+ * Like cachedir but for IRCCD_INSTALL_DATADIR.
  *
  * \return the evaluated data directory.
  * \see cachedir
@@ -111,7 +111,7 @@
 auto datadir() -> boost::filesystem::path;
 
 /**
- * Like cachedir but for CMAKE_INSTALL_SYSCONFDIR.
+ * Like cachedir but for IRCCD_INSTALL_SYSCONFDIR.
  *
  * \return the evaluated config directory.
  * \see cachedir
@@ -121,7 +121,7 @@
 auto sysconfdir() -> boost::filesystem::path;
 
 /**
- * Like cachedir but for CMAKE_INSTALL_LIBDIR.
+ * Like cachedir but for IRCCD_INSTALL_LIBDIR.
  *
  * \return the evaluated system plugin directory.
  * \see cachedir
--- a/libirccd-js/irccd/js/file_js_api.cpp	Sat Aug 11 21:49:09 2018 +0200
+++ b/libirccd-js/irccd/js/file_js_api.cpp	Sun Aug 12 09:40:36 2018 +0200
@@ -350,7 +350,7 @@
 
 // {{{ Irccd.File.prototype.stat
 
-#if defined(HAVE_STAT)
+#if defined(IRCCD_HAVE_STAT)
 
 /*
  * Method: Irccd.File.prototype.stat() [optional]
@@ -378,7 +378,7 @@
     });
 }
 
-#endif // !HAVE_STAT
+#endif // !IRCCD_HAVE_STAT
 
 // }}}
 
@@ -602,7 +602,7 @@
 
 // {{{ Irccd.File.stat
 
-#if defined(HAVE_STAT)
+#if defined(IRCCD_HAVE_STAT)
 
 /*
  * Function Irccd.File.stat(path) [optional]
@@ -629,7 +629,7 @@
     });
 }
 
-#endif // !HAVE_STAT
+#endif // !IRCCD_HAVE_STAT
 
 // }}}
 
@@ -644,7 +644,7 @@
     { "readline",   File_prototype_readline,    0 },
     { "remove",     File_prototype_remove,      0 },
     { "seek",       File_prototype_seek,        2 },
-#if defined(HAVE_STAT)
+#if defined(IRCCD_HAVE_STAT)
     { "stat",       File_prototype_stat,        0 },
 #endif
     { "tell",       File_prototype_tell,        0 },
@@ -657,7 +657,7 @@
     { "dirname",    File_dirname,               1 },
     { "exists",     File_exists,                1 },
     { "remove",     File_remove,                1 },
-#if defined(HAVE_STAT)
+#if defined(IRCCD_HAVE_STAT)
     { "stat",       File_stat,                  1 },
 #endif
     { nullptr,      nullptr,                    0 }
@@ -736,7 +736,7 @@
 
 // {{{ duk::type_traits<struct stat>
 
-#if defined(HAVE_STAT)
+#if defined(IRCCD_HAVE_STAT)
 
 void duk::type_traits<struct stat>::push(duk_context* ctx, const struct stat& st)
 {
@@ -744,61 +744,61 @@
 
     duk_push_object(ctx);
 
-#if defined(HAVE_STAT_ST_ATIME)
+#if defined(IRCCD_HAVE_STAT_ST_ATIME)
     duk_push_int(ctx, st.st_atime);
     duk_put_prop_string(ctx, -2, "atime");
 #endif
-#if defined(HAVE_STAT_ST_BLKSIZE)
+#if defined(IRCCD_HAVE_STAT_ST_BLKSIZE)
     duk_push_int(ctx, st.st_blksize);
     duk_put_prop_string(ctx, -2, "blksize");
 #endif
-#if defined(HAVE_STAT_ST_BLOCKS)
+#if defined(IRCCD_HAVE_STAT_ST_BLOCKS)
     duk_push_int(ctx, st.st_blocks);
     duk_put_prop_string(ctx, -2, "blocks");
 #endif
-#if defined(HAVE_STAT_ST_CTIME)
+#if defined(IRCCD_HAVE_STAT_ST_CTIME)
     duk_push_int(ctx, st.st_ctime);
     duk_put_prop_string(ctx, -2, "ctime");
 #endif
-#if defined(HAVE_STAT_ST_DEV)
+#if defined(IRCCD_HAVE_STAT_ST_DEV)
     duk_push_int(ctx, st.st_dev);
     duk_put_prop_string(ctx, -2, "dev");
 #endif
-#if defined(HAVE_STAT_ST_GID)
+#if defined(IRCCD_HAVE_STAT_ST_GID)
     duk_push_int(ctx, st.st_gid);
     duk_put_prop_string(ctx, -2, "gid");
 #endif
-#if defined(HAVE_STAT_ST_INO)
+#if defined(IRCCD_HAVE_STAT_ST_INO)
     duk_push_int(ctx, st.st_ino);
     duk_put_prop_string(ctx, -2, "ino");
 #endif
-#if defined(HAVE_STAT_ST_MODE)
+#if defined(IRCCD_HAVE_STAT_ST_MODE)
     duk_push_int(ctx, st.st_mode);
     duk_put_prop_string(ctx, -2, "mode");
 #endif
-#if defined(HAVE_STAT_ST_MTIME)
+#if defined(IRCCD_HAVE_STAT_ST_MTIME)
     duk_push_int(ctx, st.st_mtime);
     duk_put_prop_string(ctx, -2, "mtime");
 #endif
-#if defined(HAVE_STAT_ST_NLINK)
+#if defined(IRCCD_HAVE_STAT_ST_NLINK)
     duk_push_int(ctx, st.st_nlink);
     duk_put_prop_string(ctx, -2, "nlink");
 #endif
-#if defined(HAVE_STAT_ST_RDEV)
+#if defined(IRCCD_HAVE_STAT_ST_RDEV)
     duk_push_int(ctx, st.st_rdev);
     duk_put_prop_string(ctx, -2, "rdev");
 #endif
-#if defined(HAVE_STAT_ST_SIZE)
+#if defined(IRCCD_HAVE_STAT_ST_SIZE)
     duk_push_int(ctx, st.st_size);
     duk_put_prop_string(ctx, -2, "size");
 #endif
-#if defined(HAVE_STAT_ST_UID)
+#if defined(IRCCD_HAVE_STAT_ST_UID)
     duk_push_int(ctx, st.st_uid);
     duk_put_prop_string(ctx, -2, "uid");
 #endif
 }
 
-#endif // !HAVE_STAT
+#endif // !IRCCD_HAVE_STAT
 
 // }}}
 
--- a/libirccd-js/irccd/js/file_js_api.hpp	Sat Aug 11 21:49:09 2018 +0200
+++ b/libirccd-js/irccd/js/file_js_api.hpp	Sun Aug 12 09:40:36 2018 +0200
@@ -26,7 +26,7 @@
 
 #include <irccd/sysconfig.hpp>
 
-#if defined(HAVE_STAT)
+#if defined(IRCCD_HAVE_STAT)
 #   include <sys/types.h>
 #   include <sys/stat.h>
 #endif
@@ -184,7 +184,7 @@
     static auto require(duk_context* ctx, duk_idx_t index) -> std::shared_ptr<file>;
 };
 
-#if defined(HAVE_STAT)
+#if defined(IRCCD_HAVE_STAT)
 
 /**
  * \brief Specialization for struct stat.
@@ -202,7 +202,7 @@
     static void push(duk_context* ctx, const struct stat& st);
 };
 
-#endif // !HAVE_STAT
+#endif // !IRCCD_HAVE_STAT
 
 } // !duk
 
--- a/libirccd-js/irccd/js/system_js_api.cpp	Sat Aug 11 21:49:09 2018 +0200
+++ b/libirccd-js/irccd/js/system_js_api.cpp	Sun Aug 12 09:40:36 2018 +0200
@@ -22,7 +22,7 @@
 #include <cstdlib>
 #include <thread>
 
-#if defined(HAVE_POPEN)
+#if defined(IRCCD_HAVE_POPEN)
 #  include <cstdio>
 #endif
 
@@ -147,7 +147,7 @@
 
 // {{{ Irccd.System.popen
 
-#if defined(HAVE_POPEN)
+#if defined(IRCCD_HAVE_POPEN)
 
 /*
  * Function: Irccd.System.popen(cmd, mode) [optional]
@@ -175,7 +175,7 @@
     });
 }
 
-#endif // !HAVE_POPEN
+#endif // !IRCCD_HAVE_POPEN
 
 // }}}
 
@@ -298,7 +298,7 @@
     { "exec",       System_exec,    1 },
     { "home",       System_home,    0 },
     { "name",       System_name,    0 },
-#if defined(HAVE_POPEN)
+#if defined(IRCCD_HAVE_POPEN)
     { "popen",      System_popen,   2 },
 #endif
     { "sleep",      System_sleep,   1 },
--- a/libirccd/irccd/daemon/irccd.cpp	Sat Aug 11 21:49:09 2018 +0200
+++ b/libirccd/irccd/daemon/irccd.cpp	Sun Aug 12 09:40:36 2018 +0200
@@ -139,11 +139,11 @@
 
 void irccd::load_logs_syslog()
 {
-#if defined(HAVE_SYSLOG)
+#if defined(IRCCD_HAVE_SYSLOG)
     sink_ = std::make_unique<logger::syslog_sink>();
 #else
     sink_->warning("logs", "") << "logs: syslog is not available on this platform" << std::endl;
-#endif // !HAVE_SYSLOG
+#endif // !IRCCD_HAVE_SYSLOG
 }
 
 void irccd::load_logs()
--- a/libirccd/irccd/daemon/logger.cpp	Sat Aug 11 21:49:09 2018 +0200
+++ b/libirccd/irccd/daemon/logger.cpp	Sun Aug 12 09:40:36 2018 +0200
@@ -23,9 +23,9 @@
 
 #include "logger.hpp"
 
-#if defined(HAVE_SYSLOG)
+#if defined(IRCCD_HAVE_SYSLOG)
 #  include <syslog.h>
-#endif // !HAVE_SYSLOG
+#endif // !IRCCD_HAVE_SYSLOG
 
 namespace irccd::logger {
 
@@ -140,7 +140,7 @@
 {
 }
 
-#if defined(HAVE_SYSLOG)
+#if defined(IRCCD_HAVE_SYSLOG)
 
 syslog_sink::syslog_sink()
 {
@@ -167,7 +167,7 @@
     syslog(LOG_DEBUG | LOG_USER, "%s", line.c_str());
 }
 
-#endif // !HAVE_SYSLOG
+#endif // !IRCCD_HAVE_SYSLOG
 
 sink::sink()
     : filter_(new filter)
--- a/libirccd/irccd/daemon/logger.hpp	Sat Aug 11 21:49:09 2018 +0200
+++ b/libirccd/irccd/daemon/logger.hpp	Sun Aug 12 09:40:36 2018 +0200
@@ -380,7 +380,7 @@
     void write_warning(const std::string& line) override;
 };
 
-#if defined(HAVE_SYSLOG)
+#if defined(IRCCD_HAVE_SYSLOG)
 
 /**
  * \brief Implements logger into syslog.
@@ -414,7 +414,7 @@
     ~syslog_sink();
 };
 
-#endif // !HAVE_SYSLOG
+#endif // !IRCCD_HAVE_SYSLOG
 
 } // !irccd::logger
 
--- a/tests/src/libirccd-js/js-api-system/main.cpp	Sat Aug 11 21:49:09 2018 +0200
+++ b/tests/src/libirccd-js/js-api-system/main.cpp	Sun Aug 12 09:40:36 2018 +0200
@@ -40,7 +40,7 @@
     BOOST_TEST(duk_get_string(plugin_->get_context(), -1) == sys::home());
 }
 
-#if defined(HAVE_POPEN)
+#if defined(IRCCD_HAVE_POPEN)
 
 BOOST_AUTO_TEST_CASE(popen)
 {