Merge remote-tracking branch 'origin/released'

* origin/released:
  Updated to latest CVS version of pthreads

Conflicts:
	pthreads/Makefile

1 files changed, 92 insertions, 87 deletions

diff --git a/pthreads/pthread_getspecific.c b/pthreads/pthread_getspecific.c
index 51a15ba13..77caa6b18 100644
--- a/pthreads/pthread_getspecific.c
+++ b/pthreads/pthread_getspecific.c
@@ -1,87 +1,92 @@
-/*

- * pthread_getspecific.c

- *

- * Description:

- * POSIX thread functions which implement thread-specific data (TSD).

- *

- * --------------------------------------------------------------------------

- *

- *      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

- * 

- *      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

- *      following World Wide Web location:

- *      http://sources.redhat.com/pthreads-win32/contributors.html

- * 

- *      This library is free software; you can redistribute it and/or

- *      modify it under the terms of the GNU Lesser General Public

- *      License as published by the Free Software Foundation; either

- *      version 2 of the License, or (at your option) any later version.

- * 

- *      This library is distributed in the hope that it will be useful,

- *      but WITHOUT ANY WARRANTY; without even the implied warranty of

- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- *      Lesser General Public License for more details.

- * 

- *      You should have received a copy of the GNU Lesser General Public

- *      License along with this library in the file COPYING.LIB;

- *      if not, write to the Free Software Foundation, Inc.,

- *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

- */

-

-#include "pthread.h"

-#include "implement.h"

-

-

-void *

-pthread_getspecific (pthread_key_t key)

-     /*

-      * ------------------------------------------------------

-      * DOCPUBLIC

-      *      This function returns the current value of key in the

-      *      calling thread. If no value has been set for 'key' in 

-      *      the thread, NULL is returned.

-      *

-      * PARAMETERS

-      *      key

-      *              an instance of pthread_key_t

-      *

-      *

-      * DESCRIPTION

-      *      This function returns the current value of key in the

-      *      calling thread. If no value has been set for 'key' in 

-      *      the thread, NULL is returned.

-      *

-      * RESULTS

-      *              key value or NULL on failure

-      *

-      * ------------------------------------------------------

-      */

-{

-  void * ptr;

-

-  if (key == NULL)

-    {

-      ptr = NULL;

-    }

-  else

-    {

-      int lasterror = GetLastError ();

-#if defined(RETAIN_WSALASTERROR)

-      int lastWSAerror = WSAGetLastError ();

-#endif

-      ptr = TlsGetValue (key->key);

-

-      SetLastError (lasterror);

-#if defined(RETAIN_WSALASTERROR)

-      WSASetLastError (lastWSAerror);

-#endif

-    }

-

-  return ptr;

-}

+/*
+ * pthread_getspecific.c
+ *
+ * Description:
+ * POSIX thread functions which implement thread-specific data (TSD).
+ *
+ * --------------------------------------------------------------------------
+ *
+ *      Pthreads-win32 - POSIX Threads Library for Win32
+ *      Copyright(C) 1998 John E. Bossom
+ *      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
+ *      following World Wide Web location:
+ *      http://sources.redhat.com/pthreads-win32/contributors.html
+ * 
+ *      This library is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU Lesser General Public
+ *      License as published by the Free Software Foundation; either
+ *      version 2 of the License, or (at your option) any later version.
+ * 
+ *      This library is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *      Lesser General Public License for more details.
+ * 
+ *      You should have received a copy of the GNU Lesser General Public
+ *      License along with this library in the file COPYING.LIB;
+ *      if not, write to the Free Software Foundation, Inc.,
+ *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "pthread.h"
+#include "implement.h"
+
+
+void *
+pthread_getspecific (pthread_key_t key)
+     /*
+      * ------------------------------------------------------
+      * DOCPUBLIC
+      *      This function returns the current value of key in the
+      *      calling thread. If no value has been set for 'key' in 
+      *      the thread, NULL is returned.
+      *
+      * PARAMETERS
+      *      key
+      *              an instance of pthread_key_t
+      *
+      *
+      * DESCRIPTION
+      *      This function returns the current value of key in the
+      *      calling thread. If no value has been set for 'key' in 
+      *      the thread, NULL is returned.
+      *
+      * RESULTS
+      *              key value or NULL on failure
+      *
+      * ------------------------------------------------------
+      */
+{
+  void * ptr;
+
+  if (key == NULL)
+    {
+      ptr = NULL;
+    }
+  else
+    {
+      int lasterror = GetLastError ();
+#if defined(RETAIN_WSALASTERROR)
+      int lastWSAerror = WSAGetLastError ();
+#endif
+      ptr = TlsGetValue (key->key);
+
+      SetLastError (lasterror);
+#if defined(RETAIN_WSALASTERROR)
+      WSASetLastError (lastWSAerror);
+#endif
+    }
+
+  return ptr;
+}