Changeset 3273 in orxonox.OLD for orxonox/branches/updater/src/gui

Timestamp:

Dec 24, 2004, 9:43:22 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/updater: checking if pthread is an option

Location:

orxonox/branches/updater/src/gui

Files:

• Makefile.in (modified) (1 diff)
• orxonox_gui_update.cc (modified) (4 diffs)
• orxonox_gui_update.h (modified) (2 diffs)

orxonox/branches/updater/src/gui/Makefile.in

@@ -232 +232 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/gui/Makefile
+          $(AUTOMAKE) --gnu  src/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/branches/updater/src/gui/orxonox_gui_update.cc

@@ -200 +200 @@
 }
 
+#ifdef HAVE_CURL
 CURL* OrxonoxGuiUpdate::curlHandle = NULL;
+#endif /* HAVE_CURL */
+
+#ifdef HAVE_PTHREAD_H
 pthread_t* OrxonoxGuiUpdate::downloadThreadID = new pthread_t;
+#endif /* HAVE_PTHREAD_H */
 bool OrxonoxGuiUpdate::isDownloading = false;
 
@@ -217 +222 @@
   strcpy (fileOnDisk, info->localRoot);
   strcat (fileOnDisk, info->fileName);
-  pthread_t test;
+
   if(curlHandle)
     {
@@ -234 +239 @@
         {
           //! \todo check if threads really were created.
+#ifdef HAVE_PTHREAD_H
           pthread_create(downloadThreadID, NULL, downloadThread, info);
+#else
+          downloadThread(info);
+#endif /* HAVE_PTHREAD_H */
+         
           //      else 
           //    PRINTF(1)("thread already in use\n");
@@ -252 +262 @@
   if (curlHandle)
     curl_easy_cleanup(curlHandle);
-
+#ifdef HAVE_PTHREAD_H
   pthread_join(*downloadThreadID, NULL);
+#endif /* HAVE_PTHREAD_H */
   PRINTF(3)("Closing the downloaded file.\n");
   fclose(info->fileHandle);

orxonox/branches/updater/src/gui/orxonox_gui_update.h

@@ -14 +14 @@
 #include <curl/easy.h>
 #endif /* HAVE_CURL */
+#ifdef HAVE_PTHREAD_H
 #include <pthread.h>
+#endif /* HAVE_PTHREAD_H */
 using namespace std;
 
@@ -64 +66 @@
   static gint cancelDownload(GtkWidget* w, GdkEventKey* event, void* bar);
 #endif /* HAVE_GTK2 */  
+#ifdef HAVE_PTHREAD_H
   static pthread_t* downloadThreadID;
+#endif /* HAVE_PTHREAD_H */
   static bool isDownloading;