Changeset 358 for trunk

Timestamp:

May 4, 2012, 10:15:11 PM (13 years ago)

Author:

dmik

Message:

icedtea-web: Replace missing clock_gettime() with time().

Location:

trunk/icedtea-web/plugin/icedteanp

Files:

• IcedTeaJavaRequestProcessor.cc (modified) (3 diffs)
• IcedTeaPluginUtils.cc (modified) (2 diffs)

trunk/icedtea-web/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc

@@ -242 +242 @@
 {
     struct timespec t;
+#ifdef __OS2__
+    t.tv_sec = time(NULL);
+    t.tv_nsec = 0;
+#else
     clock_gettime(CLOCK_REALTIME, &t);
+#endif
     t.tv_sec += REQUESTTIMEOUT; // 1 minute timeout
 
@@ -253 +258 @@
     // Wait for result to be filled in.
     struct timespec curr_t;
+#ifdef __OS2__
+    curr_t.tv_sec = curr_t.tv_nsec = 0;
+#endif
 
     bool isPluginThread = false;
@@ -264 +272 @@
     do
     {
+#ifdef __OS2__
+        curr_t.tv_sec = time(NULL);
+#else
         clock_gettime(CLOCK_REALTIME, &curr_t);
+#endif
 
         if (!result_ready && (curr_t.tv_sec < t.tv_sec))

trunk/icedtea-web/plugin/icedteanp/IcedTeaPluginUtils.cc

@@ -932 +932 @@
     struct timespec t;
     struct timespec curr_t;
+#ifdef __OS2__
+    t.tv_sec = time(NULL);
+    t.tv_nsec = 0;
+    curr_t.tv_sec = curr_t.tv_nsec = 0;
+#else
     clock_gettime(CLOCK_REALTIME, &t);
+#endif
     t.tv_sec += REQUESTTIMEOUT; // timeout
 
@@ -940 +946 @@
     do
     {
+#ifdef __OS2__
+        curr_t.tv_sec = time(NULL);
+#else
         clock_gettime(CLOCK_REALTIME, &curr_t);
+#endif
         if (data != NULL && !data->result_ready && (curr_t.tv_sec < t.tv_sec))
         {