*Merge some fixes from tc1

--HG--
branch : trunk

3 files changed, 1 insertions, 59 deletions

diff --git a/dep/src/Makefile.am b/dep/src/Makefile.am
index 6ae2808895c..50814f8ff13 100644
--- a/dep/src/Makefile.am
+++ b/dep/src/Makefile.am
@@ -19,7 +19,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Sub-directories to parse
-SUBDIRS = g3dlite sockets zlib zthread
+SUBDIRS = g3dlite sockets zlib
 
 ## Additional files to include when running 'make dist'
 #  Nothing yet.
diff --git a/dep/src/zthread/AtomicCount.cxx b/dep/src/zthread/AtomicCount.cxx
deleted file mode 100644
index ac0d0773b12..00000000000
--- a/dep/src/zthread/AtomicCount.cxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2005, Eric Crahen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef __ZTATOMICCOUNTSELECT_H__
-#define __ZTATOMICCOUNTSELECT_H__
-
-#include "zthread/AtomicCount.h"
-#include "zthread/Config.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/*
-// Select the correct AtomicCount implementation based on
-// what the compilation environment has defined
-
-#ifndef ZT_VANILLA
-
-#if defined(HAVE_ATOMIC_LINUX)
-#  include "linux/AtomicCount.cxx"
-#elif defined(ZT_WIN32)
-#  include "win32/AtomicCount.cxx"
-#elif defined(ZT_WIN9X)
-#  include "win9x/AtomicCount.cxx"
-#endif
-
-#endif
-
-// Default to an AtomicCount that just uses a FastLock
-#ifndef __ZTATOMICCOUNTIMPL_H__
-#  include "vanilla/SimpleAtomicCount.cxx"
-#endif
-*/
-
-#  include "vanilla/SimpleAtomicCount.cxx"
-
-#endif // __ZTATOMICCOUNTSELECT_H__
diff --git a/dep/src/zthread/CMakeLists.txt b/dep/src/zthread/CMakeLists.txt
index 61fb1310588..c2ac36c367c 100644
--- a/dep/src/zthread/CMakeLists.txt
+++ b/dep/src/zthread/CMakeLists.txt
@@ -1,7 +1,6 @@
 ########### next target ###############
 
 SET(ZThread_LIB_SRCS
-   AtomicCount.cxx
    Condition.cxx
    ConcurrentExecutor.cxx
    CountingSemaphore.cxx