[ntpsec commit] Reduce ISC mutexes to ANSI mutexes.
Eric S. Raymond
esr at ntpsec.org
Tue Sep 29 09:00:55 UTC 2015
Module: ntpsec
Branch: master
Commit: 2b4b940dd2c93e2a83753b7e0dd17f565b1a35d4
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=2b4b940dd2c93e2a83753b7e0dd17f565b1a35d4
Author: Eric S. Raymond <esr at thyrsus.com>
Date: Tue Sep 29 04:59:44 2015 -0400
Reduce ISC mutexes to ANSI mutexes.
---
include/isc/mem.h | 1 -
lib/isc/include/isc/util.h | 9 +--
lib/isc/log.c | 9 +--
lib/isc/pthreads/condition.c | 4 +-
lib/isc/pthreads/include/isc/condition.h | 5 +-
lib/isc/pthreads/include/isc/mutex.h | 73 ----------------------
lib/isc/pthreads/mutex.c | 79 ------------------------
lib/isc/random.c | 1 -
lib/isc/result.c | 7 +--
lib/isc/unix/include/isc/time.h | 2 +
lib/isc/win32/condition.c | 6 +-
lib/isc/win32/include/isc/condition.h | 5 +-
lib/isc/win32/include/isc/mutex.h | 53 ----------------
lib/isc/win32/libisc.def | 2 -
lib/isc/win32/libisc.dsp | 4 --
lib/isc/wscript | 1 -
ports/winnt/vs2008/libntp/libntp.vcproj | 4 --
ports/winnt/vs2013/libntp/libntp.vcxproj | 1 -
ports/winnt/vs2013/libntp/libntp.vcxproj.filters | 3 -
19 files changed, 22 insertions(+), 247 deletions(-)
diff --git a/include/isc/mem.h b/include/isc/mem.h
index 5eebcd7..e762036 100644
--- a/include/isc/mem.h
+++ b/include/isc/mem.h
@@ -34,7 +34,6 @@
#include <stdio.h>
#include <isc/lang.h>
-#include <isc/mutex.h>
#include <isc/platform.h>
#include <isc/types.h>
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 5129879..1db2712 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -97,14 +97,14 @@
isc_msgcat_get(isc_msgcat, ISC_MSGSET_UTIL, \
ISC_MSG_LOCKING, "LOCKING"), \
(lp), __FILE__, __LINE__)); \
- RUNTIME_CHECK(isc_mutex_lock((lp)) == ISC_R_SUCCESS); \
+ RUNTIME_CHECK(pthread_mutex_lock((lp)) == 0); \
ISC_UTIL_TRACE(fprintf(stderr, "%s %p %s %d\n", \
isc_msgcat_get(isc_msgcat, ISC_MSGSET_UTIL, \
ISC_MSG_LOCKED, "LOCKED"), \
(lp), __FILE__, __LINE__)); \
} while (0)
#define UNLOCK(lp) do { \
- RUNTIME_CHECK(isc_mutex_unlock((lp)) == ISC_R_SUCCESS); \
+ RUNTIME_CHECK(pthread_mutex_unlock((lp)) == 0); \
ISC_UTIL_TRACE(fprintf(stderr, "%s %p %s %d\n", \
isc_msgcat_get(isc_msgcat, ISC_MSGSET_UTIL, \
ISC_MSG_UNLOCKED, "UNLOCKED"), \
@@ -112,7 +112,7 @@
} while (0)
#define ISLOCKED(lp) (1)
#define DESTROYLOCK(lp) \
- RUNTIME_CHECK(isc_mutex_destroy((lp)) == ISC_R_SUCCESS)
+ RUNTIME_CHECK(pthread_mutex_destroy((lp)) == 0)
#define BROADCAST(cvp) do { \
@@ -176,9 +176,6 @@
RUNTIME_CHECK(isc_rwlock_unlock((lp), (t)) == ISC_R_SUCCESS); \
} while (0)
-#define DESTROYMUTEXBLOCK(bp, n) \
- RUNTIME_CHECK(isc_mutexblock_destroy((bp), (n)) == ISC_R_SUCCESS)
-
/*
* List Macros.
*/
diff --git a/lib/isc/log.c b/lib/isc/log.c
index 12098f7..8162f9f 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -28,6 +28,7 @@
#include <time.h>
#include <dirent.h>
#include <stdio.h>
+#include <pthread.h>
#include <sys/types.h> /* dev_t FreeBSD 2.1 */
#include <sys/stat.h>
@@ -153,7 +154,7 @@ struct isc_log {
isc_logmodule_t * modules;
unsigned int module_count;
int debug_level;
- isc_mutex_t lock;
+ pthread_mutex_t lock;
/* Locked by isc_log lock. */
isc_logconfig_t * logconfig;
char buffer[LOG_BUFFER_SIZE];
@@ -270,7 +271,7 @@ isc_result_t
isc_log_create(isc_mem_t *mctx, isc_log_t **lctxp, isc_logconfig_t **lcfgp) {
isc_log_t *lctx;
isc_logconfig_t *lcfg = NULL;
- isc_result_t result;
+ int result;
REQUIRE(mctx != NULL);
REQUIRE(lctxp != NULL && *lctxp == NULL);
@@ -287,8 +288,8 @@ isc_log_create(isc_mem_t *mctx, isc_log_t **lctxp, isc_logconfig_t **lcfgp) {
ISC_LIST_INIT(lctx->messages);
- result = isc_mutex_init(&lctx->lock);
- if (result != ISC_R_SUCCESS) {
+ result = pthread_mutex_init(&lctx->lock, NULL);
+ if (result != 0) {
isc_mem_put(mctx, lctx, sizeof(*lctx));
return (result);
}
diff --git a/lib/isc/pthreads/condition.c b/lib/isc/pthreads/condition.c
index 63bf733..77c9852 100644
--- a/lib/isc/pthreads/condition.c
+++ b/lib/isc/pthreads/condition.c
@@ -28,11 +28,11 @@
#include <isc/util.h>
isc_result_t
-isc_condition_waituntil(isc_condition_t *c, isc_mutex_t *m, isc_time_t *t) {
+isc_condition_waituntil(isc_condition_t *c, pthread_mutex_t *m, isc_time_t *t) {
int presult;
isc_result_t result;
struct timespec ts;
- char strbuf[BUFSIZ];
+ char strbuf[1024];
REQUIRE(c != NULL && m != NULL && t != NULL);
diff --git a/lib/isc/pthreads/include/isc/condition.h b/lib/isc/pthreads/include/isc/condition.h
index 7830106..281509f 100644
--- a/lib/isc/pthreads/include/isc/condition.h
+++ b/lib/isc/pthreads/include/isc/condition.h
@@ -20,8 +20,9 @@
/*! \file */
+#include <pthread.h>
+
#include <isc/lang.h>
-#include <isc/mutex.h>
#include <isc/result.h>
#include <isc/types.h>
@@ -50,7 +51,7 @@ typedef pthread_cond_t isc_condition_t;
ISC_LANG_BEGINDECLS
isc_result_t
-isc_condition_waituntil(isc_condition_t *, isc_mutex_t *, isc_time_t *);
+isc_condition_waituntil(isc_condition_t *, pthread_mutex_t *, isc_time_t *);
ISC_LANG_ENDDECLS
diff --git a/lib/isc/pthreads/include/isc/mutex.h b/lib/isc/pthreads/include/isc/mutex.h
deleted file mode 100644
index 40446a6..0000000
--- a/lib/isc/pthreads/include/isc/mutex.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1998-2002 Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef GUARD_ISC_MUTEX_H
-#define GUARD_ISC_MUTEX_H 1
-
-/*! \file */
-
-#include <pthread.h>
-#include <stdio.h>
-
-#include <isc/lang.h>
-#include <isc/result.h> /* for ISC_R_ codes */
-
-ISC_LANG_BEGINDECLS
-
-/*!
- * Supply mutex attributes that enable deadlock detection
- * (helpful when debugging). This is system dependent and
- * currently only supported on NetBSD.
- */
-#if ISC_MUTEX_DEBUG && defined(__NetBSD__) && defined(PTHREAD_MUTEX_ERRORCHECK)
-extern pthread_mutexattr_t isc__mutex_attrs;
-#define ISC__MUTEX_ATTRS &isc__mutex_attrs
-#else
-#define ISC__MUTEX_ATTRS NULL
-#endif
-
-/* XXX We could do fancier error handling... */
-
-typedef pthread_mutex_t isc_mutex_t;
-
-#if ISC_MUTEX_DEBUG && defined(PTHREAD_MUTEX_ERRORCHECK)
-#define isc_mutex_init(mp) \
- isc_mutex_init_errcheck((mp))
-#else
-#define isc_mutex_init(mp) \
- isc__mutex_init((mp), __FILE__, __LINE__)
-isc_result_t isc__mutex_init(isc_mutex_t *mp, const char *file, unsigned int line);
-#endif
-
-#define isc_mutex_lock(mp) \
- ((pthread_mutex_lock((mp)) == 0) ? \
- ISC_R_SUCCESS : ISC_R_UNEXPECTED)
-
-#define isc_mutex_unlock(mp) \
- ((pthread_mutex_unlock((mp)) == 0) ? \
- ISC_R_SUCCESS : ISC_R_UNEXPECTED)
-
-#define isc_mutex_trylock(mp) \
- ((pthread_mutex_trylock((mp)) == 0) ? \
- ISC_R_SUCCESS : ISC_R_LOCKBUSY)
-
-#define isc_mutex_destroy(mp) \
- ((pthread_mutex_destroy((mp)) == 0) ? \
- ISC_R_SUCCESS : ISC_R_UNEXPECTED)
-
-ISC_LANG_ENDDECLS
-#endif /* GUARD_ISC_MUTEX_H */
diff --git a/lib/isc/pthreads/mutex.c b/lib/isc/pthreads/mutex.c
deleted file mode 100644
index c72e305..0000000
--- a/lib/isc/pthreads/mutex.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2004, 2005, 2007, 2008, 2011, 2012 Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000-2002 Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*! \file */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <time.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <string.h>
-
-#include <isc/mutex.h>
-#include <isc/util.h>
-
-#if ISC_MUTEX_DEBUG && defined(PTHREAD_MUTEX_ERRORCHECK)
-isc_result_t
-isc_mutex_init_errcheck(isc_mutex_t *mp)
-{
- pthread_mutexattr_t attr;
- int err;
-
- if (pthread_mutexattr_init(&attr) != 0)
- return (ISC_R_UNEXPECTED);
-
- if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK) != 0) {
- pthread_mutexattr_destroy(&attr);
- return (ISC_R_UNEXPECTED);
- }
-
- err = pthread_mutex_init(mp, &attr) != 0)
- pthread_mutexattr_destroy(&attr);
- if (err == ENOMEM)
- return (ISC_R_NOMEMORY);
- return ((err == 0) ? ISC_R_SUCCESS : ISC_R_UNEXPECTED);
-}
-#endif
-
-#if ISC_MUTEX_DEBUG && defined(__NetBSD__) && defined(PTHREAD_MUTEX_ERRORCHECK)
-pthread_mutexattr_t isc__mutex_attrs = {
- PTHREAD_MUTEX_ERRORCHECK, /* m_type */
- 0 /* m_flags, which appears to be unused. */
-};
-#endif
-
-#if !(ISC_MUTEX_DEBUG && defined(PTHREAD_MUTEX_ERRORCHECK))
-isc_result_t
-isc__mutex_init(isc_mutex_t *mp, const char *file, unsigned int line) {
- char strbuf[BUFSIZ];
- isc_result_t result = ISC_R_SUCCESS;
- int err;
-
- err = pthread_mutex_init(mp, ISC__MUTEX_ATTRS);
- if (err == ENOMEM)
- return (ISC_R_NOMEMORY);
- if (err != 0) {
- ISC_IGNORE(strerror_r(errno, strbuf, sizeof(strbuf)));
- UNEXPECTED_ERROR(file, line, "isc_mutex_init() failed: %s",
- strbuf);
- result = ISC_R_UNEXPECTED;
- }
- return (result);
-}
-#endif
diff --git a/lib/isc/random.c b/lib/isc/random.c
index 6094d16..5983235 100644
--- a/lib/isc/random.c
+++ b/lib/isc/random.c
@@ -26,7 +26,6 @@
#include <sys/types.h>
#include <unistd.h>
-#include <isc/mutex.h>
#include <isc/once.h>
#include <isc/random.h>
#include <isc/util.h>
diff --git a/lib/isc/result.c b/lib/isc/result.c
index da57272..e936f9b 100644
--- a/lib/isc/result.c
+++ b/lib/isc/result.c
@@ -15,8 +15,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id$ */
-
/*! \file */
#include <config.h>
@@ -26,7 +24,6 @@
#include <isc/lib.h>
#include <isc/msgs.h>
-#include <isc/mutex.h>
#include <isc/once.h>
#include <isc/resultclass.h>
#include <isc/util.h>
@@ -110,7 +107,7 @@ static const char *text[ISC_R_NRESULTS] = {
static isc_once_t once = ISC_ONCE_INIT;
static ISC_LIST(resulttable) tables;
-static isc_mutex_t lock;
+static pthread_mutex_t lock;
static isc_result_t
register_table(unsigned int base, unsigned int nresults, const char **txt,
@@ -149,7 +146,7 @@ static void
initialize_action(void) {
isc_result_t result;
- RUNTIME_CHECK(isc_mutex_init(&lock) == ISC_R_SUCCESS);
+ RUNTIME_CHECK(pthread_mutex_init(&lock, NULL) == 0);
ISC_LIST_INIT(tables);
result = register_table(ISC_RESULTCLASS_ISC, ISC_R_NRESULTS, text,
diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h
index 37f156c..4d50eb7 100644
--- a/lib/isc/unix/include/isc/time.h
+++ b/lib/isc/unix/include/isc/time.h
@@ -20,6 +20,8 @@
/*! \file */
+#include <time.h>
+
#include <isc/lang.h>
#include <isc/types.h>
diff --git a/lib/isc/win32/condition.c b/lib/isc/win32/condition.c
index 2fc35e3..16b4421 100644
--- a/lib/isc/win32/condition.c
+++ b/lib/isc/win32/condition.c
@@ -203,7 +203,7 @@ isc_condition_destroy(isc_condition_t *cond) {
* the mutex.
*/
static isc_result_t
-wait(isc_condition_t *cond, isc_mutex_t *mutex, DWORD milliseconds) {
+wait(isc_condition_t *cond, pthread_mutex_t *mutex, DWORD milliseconds) {
DWORD result;
isc_result_t tresult;
isc_condition_thread_t *threadcond = NULL;
@@ -232,12 +232,12 @@ wait(isc_condition_t *cond, isc_mutex_t *mutex, DWORD milliseconds) {
}
isc_result_t
-isc_condition_wait(isc_condition_t *cond, isc_mutex_t *mutex) {
+isc_condition_wait(isc_condition_t *cond, pthread_mutex_t *mutex) {
return (wait(cond, mutex, INFINITE));
}
isc_result_t
-isc_condition_waituntil(isc_condition_t *cond, isc_mutex_t *mutex,
+isc_condition_waituntil(isc_condition_t *cond, pthread_mutex_t *mutex,
isc_time_t *t) {
DWORD milliseconds;
isc_uint64_t microseconds;
diff --git a/lib/isc/win32/include/isc/condition.h b/lib/isc/win32/include/isc/condition.h
index e37e27d..96ef291 100644
--- a/lib/isc/win32/include/isc/condition.h
+++ b/lib/isc/win32/include/isc/condition.h
@@ -21,7 +21,6 @@
#include <windows.h>
#include <isc/lang.h>
-#include <isc/mutex.h>
#include <isc/thread.h>
#include <isc/types.h>
@@ -46,7 +45,7 @@ isc_result_t
isc_condition_init(isc_condition_t *);
isc_result_t
-isc_condition_wait(isc_condition_t *, isc_mutex_t *);
+isc_condition_wait(isc_condition_t *, pthread_mutex_t *);
isc_result_t
isc_condition_signal(isc_condition_t *);
@@ -58,7 +57,7 @@ isc_result_t
isc_condition_destroy(isc_condition_t *);
isc_result_t
-isc_condition_waituntil(isc_condition_t *, isc_mutex_t *, isc_time_t *);
+isc_condition_waituntil(isc_condition_t *, pthread_mutex_t *, isc_time_t *);
ISC_LANG_ENDDECLS
diff --git a/lib/isc/win32/include/isc/mutex.h b/lib/isc/win32/include/isc/mutex.h
deleted file mode 100644
index 53eab3d..0000000
--- a/lib/isc/win32/include/isc/mutex.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2004, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1998-2001 Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef GUARD_ISC_MUTEX_H
-#define GUARD_ISC_MUTEX_H 1
-
-#include <isc/net.h>
-#include <windows.h>
-
-#include <isc/result.h>
-
-typedef CRITICAL_SECTION isc_mutex_t;
-
-/*
- * This definition is here since some versions of WINBASE.H
- * omits it for some reason.
- */
-#if (_WIN32_WINNT < 0x0400)
-WINBASEAPI BOOL WINAPI
-TryEnterCriticalSection(LPCRITICAL_SECTION lpCriticalSection);
-#endif /* _WIN32_WINNT < 0x0400 */
-
-#define isc_mutex_init(mp) \
- (InitializeCriticalSection((mp)), ISC_R_SUCCESS)
-#define isc_mutex_lock(mp) \
- (EnterCriticalSection((mp)), ISC_R_SUCCESS)
-#define isc_mutex_unlock(mp) \
- (LeaveCriticalSection((mp)), ISC_R_SUCCESS)
-#define isc_mutex_trylock(mp) \
- (TryEnterCriticalSection((mp)) ? ISC_R_SUCCESS : ISC_R_LOCKBUSY)
-#define isc_mutex_destroy(mp) \
- (DeleteCriticalSection((mp)), ISC_R_SUCCESS)
-
-/*
- * This is a placeholder for now since we are not keeping any mutex stats
- */
-#define isc_mutex_stats(fp) do {} while (0)
-
-#endif /* GUARD_ISC_MUTEX_H */
diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def
index 2d7f1a8..5d8a7ed 100644
--- a/lib/isc/win32/libisc.def
+++ b/lib/isc/win32/libisc.def
@@ -346,8 +346,6 @@ isc_mem_renderxml
isc_msgcat_close
isc_msgcat_get
isc_msgcat_open
-isc_mutexblock_destroy
-isc_mutexblock_init
isc_net_aton
isc_net_disableipv4
isc_net_disableipv6
diff --git a/lib/isc/win32/libisc.dsp b/lib/isc/win32/libisc.dsp
index 9f5614e..9e26493 100644
--- a/lib/isc/win32/libisc.dsp
+++ b/lib/isc/win32/libisc.dsp
@@ -359,10 +359,6 @@ SOURCE=.\include\isc\msioctl.h
# End Source File
# Begin Source File
-SOURCE=.\include\isc\mutex.h
-# End Source File
-# Begin Source File
-
SOURCE=..\include\isc\mutexblock.h
# End Source File
# Begin Source File
diff --git a/lib/isc/wscript b/lib/isc/wscript
index be0f3d4..d59bd35 100644
--- a/lib/isc/wscript
+++ b/lib/isc/wscript
@@ -51,7 +51,6 @@ def build(ctx):
libisc_source_thread = [
"pthreads/condition.c",
"pthreads/thread.c",
- "pthreads/mutex.c" # XXX: some kind of conditional?
]
diff --git a/ports/winnt/vs2008/libntp/libntp.vcproj b/ports/winnt/vs2008/libntp/libntp.vcproj
index 7386111..d66dcca 100644
--- a/ports/winnt/vs2008/libntp/libntp.vcproj
+++ b/ports/winnt/vs2008/libntp/libntp.vcproj
@@ -745,10 +745,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\lib\isc\win32\include\isc\mutex.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\lib\isc\win32\include\isc\net.h"
>
</File>
diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj b/ports/winnt/vs2013/libntp/libntp.vcxproj
index 25793ef..fce53ea 100644
--- a/ports/winnt/vs2013/libntp/libntp.vcxproj
+++ b/ports/winnt/vs2013/libntp/libntp.vcxproj
@@ -360,7 +360,6 @@
<ClInclude Include="..\..\..\..\lib\isc\include\isc\socket.h" />
<ClInclude Include="..\..\..\..\lib\isc\include\isc\task.h" />
<ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\condition.h" />
- <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\mutex.h" />
<ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h" />
<ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\platform.h" />
<ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\stat.h" />
diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
index 0e197b6..73ea927 100644
--- a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
+++ b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
@@ -367,9 +367,6 @@
<ClInclude Include="..\..\..\..\include\isc\mem.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\mutex.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h">
<Filter>Header Files</Filter>
</ClInclude>
More information about the vc
mailing list