X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=tests%2Ftestthreads.c;h=2d1e62f1d2c656e6ca39f1ea8069f3674640dc0f;hb=cbc20c4dde539ed01dede8356d9cd1dc56479799;hp=71d761bde92c73735e8db9bec7e05ff4112c494a;hpb=dc93f21ffe52d42c6e99e7b5976fc7a89df4d4f3;p=~andy%2Fgtk

diff --git a/tests/testthreads.c b/tests/testthreads.c
index 71d761bde..2d1e62f1d 100644
--- a/tests/testthreads.c
+++ b/tests/testthreads.c
@@ -2,26 +2,36 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
 #include <stdio.h>
+#include <unistd.h>
 #include <gtk/gtk.h>
-#include "../config.h"
-#include <pthread.h>
+#include "config.h"
 
 #ifdef USE_PTHREADS
+#include <pthread.h>
+
 static int nthreads = 0;
 static pthread_mutex_t nthreads_mutex = PTHREAD_MUTEX_INITIALIZER;
 
@@ -80,7 +90,7 @@ counter (void *data)
   while (!flag)
     {
       sprintf(buffer, "%d", counter);
-      gtk_label_set (GTK_LABEL (label), buffer);
+      gtk_label_set_text (GTK_LABEL (label), buffer);
       gdk_threads_leave();
       counter++;
       /* Give someone else a chance to get the lock next time.
@@ -125,11 +135,11 @@ main (int argc, char **argv)
 
   for (i=0; i<5; i++)
     {
-      char buffer[10];
+      char buffer[5][10];
       pthread_t thread;
       
-      sprintf(buffer, "Thread %i", i);
-      if (pthread_create (&thread, NULL, counter, buffer))
+      sprintf(buffer[i], "Thread %i", i);
+      if (pthread_create (&thread, NULL, counter, buffer[i]))
 	{
 	  fprintf(stderr, "Couldn't create thread\n");
 	  exit(1);