commit 264af77369230d0d9e81855497305f7eac03320a
author Davide Pesavento <davidepesa@gmail.com> Tue Feb 09 21:48:24 2021 -0500
committer Davide Pesavento <davidepesa@gmail.com> Wed Feb 10 14:48:07 2021 -0500
tree 60ceca9ee57ea2fa6d2a5776133967e4f8582144
parent 6aecc500e5031e7273bc0378deb1a637b4769d00

build: prepend "NFD_" to various macro names to avoid conflicts

Change-Id: Icc370968e3d38fef80ece35a2aed56450f54b653

tools/ndn-autoconfig/procedure.hpp

diff --git a/tools/ndn-autoconfig/procedure.hpp b/tools/ndn-autoconfig/procedure.hpp
index 67e1209..7c52658 100644
--- a/tools/ndn-autoconfig/procedure.hpp
+++ b/tools/ndn-autoconfig/procedure.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2017,  Regents of the University of California,
+ * Copyright (c) 2014-2021,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -27,6 +27,7 @@
 #define NFD_TOOLS_NDN_AUTOCONFIG_PROCEDURE_HPP
 
 #include "stage.hpp"
+
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/mgmt/nfd/controller.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
@@ -63,7 +64,7 @@
   }
 
 private:
-  VIRTUAL_WITH_TESTS void
+  NFD_VIRTUAL_WITH_TESTS void
   makeStages(const Options& options);
 
   void
@@ -79,7 +80,7 @@
    */
   util::Signal<Procedure, bool> onComplete;
 
-PROTECTED_WITH_TESTS_ELSE_PRIVATE:
+NFD_PROTECTED_WITH_TESTS_ELSE_PRIVATE:
   std::vector<unique_ptr<Stage>> m_stages;
 
 private: