summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2023-01-13 13:08:57 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2023-01-13 13:08:57 +0100
commit3f7247d33935f6451bd13835015cf7bf53b50969 (patch)
treec40a23b87beac498124e1ec5b010cbcf6aa1e966
parentbbb975d6dee09baaad4e2b0425a0afb20b784005 (diff)
downloadATCD-3f7247d33935f6451bd13835015cf7bf53b50969.tar.gz
Fixed cleanup error
* ACE/ace/config-win32-common.h: * ACE/ace/config-win32-msvc.h:
-rw-r--r--ACE/ace/config-win32-common.h6
-rw-r--r--ACE/ace/config-win32-msvc.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index fd0fbec629d..bca5a046873 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -553,6 +553,12 @@
#define ACE_HAS_LLSEEK
+// Needed for obtaining the MAC address
+#include <nb30.h>
+#if defined (_MSC_VER)
+# pragma comment(lib, "netapi32.lib") // needed for obtaing MACaddress
+#endif
+
#if !defined (WINVER)
# define WINVER 0x0400 // pretend it's at least WinNT 4.0
#endif
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h
index 6f4b1b52ab5..1e1b063d420 100644
--- a/ACE/ace/config-win32-msvc.h
+++ b/ACE/ace/config-win32-msvc.h
@@ -55,7 +55,7 @@
// DLL or Debug Multithreaded DLL in the Project Settings
// under C++ Code Generation.
# error You must link against multi-threaded libraries when using ACE (check your project settings)
-# endif /* !_MT && */
+# endif /* !_MT */
#endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
#include <malloc.h>