aboutsummaryrefslogtreecommitdiff
path: root/pthreads/dll.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-13 11:03:57 +0100
committermarha <marha@users.sourceforge.net>2013-02-13 11:03:57 +0100
commit8fa17b13062c1e2acca542cc7a2ccb09aca874e8 (patch)
tree158a6239b0fdf2abf63fb7365b4cd4886c15f5b1 /pthreads/dll.c
parent4a165ef2f762a4ce9155f2a3626692326bda616d (diff)
parentb41f74438672dd682bc01ae818cb3da654f22c1e (diff)
downloadvcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.gz
vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.bz2
vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.zip
Merge remote-tracking branch 'origin/released'
* origin/released: Updated to latest CVS version of pthreads Conflicts: pthreads/Makefile
Diffstat (limited to 'pthreads/dll.c')
-rw-r--r--pthreads/dll.c25
1 files changed, 19 insertions, 6 deletions
diff --git a/pthreads/dll.c b/pthreads/dll.c
index 05e01bee7..31c427a0a 100644
--- a/pthreads/dll.c
+++ b/pthreads/dll.c
@@ -8,10 +8,11 @@
*
* Pthreads-win32 - POSIX Threads Library for Win32
* Copyright(C) 1998 John E. Bossom
- * Copyright(C) 1999,2005 Pthreads-win32 contributors
- *
- * Contact Email: rpj@callisto.canberra.edu.au
- *
+ * Copyright(C) 1999,2012 Pthreads-win32 contributors
+ *
+ * Homepage1: http://sourceware.org/pthreads-win32/
+ * Homepage2: http://sourceforge.net/projects/pthreads4w/
+ *
* The current list of contributors is contained
* in the file CONTRIBUTORS included with the source
* code distribution. The list can also be seen at the
@@ -34,11 +35,15 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-#if !defined(PTW32_STATIC_LIB)
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include "pthread.h"
#include "implement.h"
+#if !defined(PTW32_STATIC_LIB)
+
#if defined(_MSC_VER)
/*
* lpvReserved yields an unreferenced formal parameter;
@@ -89,4 +94,12 @@ DllMain (HINSTANCE hinstDll, DWORD fdwReason, LPVOID lpvReserved)
} /* DllMain */
-#endif /* PTW32_STATIC_LIB */
+#endif /* !PTW32_STATIC_LIB */
+
+#if ! defined(PTW32_BUILD_INLINED)
+/*
+ * Avoid "translation unit is empty" warnings
+ */
+typedef int foo;
+#endif
+