diff --git a/.gitignore b/.gitignore
index a326021e3..b334caf22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,3 +144,10 @@ cmake-build/
 *.bak
 stage/
 releases/
+
+# vim #
+#######
+*.orig
+*.swp
+*.vim
+tags
diff --git a/Foundation/src/Thread_POSIX.cpp b/Foundation/src/Thread_POSIX.cpp
index e29062216..ceab76e82 100644
--- a/Foundation/src/Thread_POSIX.cpp
+++ b/Foundation/src/Thread_POSIX.cpp
@@ -62,9 +62,6 @@ namespace
 #endif
 
 
-#if defined(POCO_POSIX_DEBUGGER_THREAD_NAMES)
-
-
 namespace {
 void setThreadName(pthread_t thread, const std::string& threadName)
 {
@@ -83,9 +80,6 @@ void setThreadName(pthread_t thread, const std::string& threadName)
 }
 
 
-#endif
-
-
 namespace Poco {
 
 
@@ -357,9 +351,7 @@ void* ThreadImpl::runnableEntry(void* pThread)
 #endif
 
 	ThreadImpl* pThreadImpl = reinterpret_cast<ThreadImpl*>(pThread);
-#if defined(POCO_POSIX_DEBUGGER_THREAD_NAMES)
 	setThreadName(pThreadImpl->_pData->thread, reinterpret_cast<Thread*>(pThread)->getName());
-#endif
 	AutoPtr<ThreadData> pData = pThreadImpl->_pData;
 	try
 	{