Changeset 391 for python/trunk/RISCOS/sleep.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• RISCOS/sleep.c (modified) (1 diff)

python/trunk/RISCOS/sleep.c

@@ -10 +10 @@
 int riscos_sleep(double delay)
 {
-        os_t starttime, endtime, time; /* monotonic times (centiseconds) */
-        int *pollword, ret;
-        osbool claimed;
+    os_t starttime, endtime, time; /* monotonic times (centiseconds) */
+    int *pollword, ret;
+    osbool claimed;
 
-        /* calculate end time */
-        starttime = os_read_monotonic_time();
-        if (starttime + 100.0*delay >INT_MAX)
-                endtime = INT_MAX;
-        else
-                endtime = (os_t)(starttime + 100.0*delay);
+    /* calculate end time */
+    starttime = os_read_monotonic_time();
+    if (starttime + 100.0*delay >INT_MAX)
+        endtime = INT_MAX;
+    else
+        endtime = (os_t)(starttime + 100.0*delay);
 
-        /* allocate (in RMA) and set pollword for xupcall_sleep */
-        pollword = osmodule_alloc(4);
-        *pollword = 1;
+    /* allocate (in RMA) and set pollword for xupcall_sleep */
+    pollword = osmodule_alloc(4);
+    *pollword = 1;
 
-        time = starttime;
-        ret = 0;
-        while ( time<endtime && time>=starttime ) {
-                xupcall_sleep (pollword, &claimed);
-                if (PyErr_CheckSignals()) {
-                        ret = 1;
-                        break;
-                }
-                time = os_read_monotonic_time();
-        }
+    time = starttime;
+    ret = 0;
+    while ( time<endtime && time>=starttime ) {
+        xupcall_sleep (pollword, &claimed);
+        if (PyErr_CheckSignals()) {
+            ret = 1;
+            break;
+        }
+        time = os_read_monotonic_time();
+    }
 
-        /* deallocate pollword */
-        osmodule_free(pollword);
-        return ret;
+    /* deallocate pollword */
+    osmodule_free(pollword);
+    return ret;
 }