Changeset 278

Timestamp:

Nov 2, 2009, 3:24:21 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty: os2/xsystray: Warnings.

Location:

trunk/src/3rdparty/os2/xsystray

Files:

• xsystray.c (modified) (2 diffs)
• xsystray_api.c (modified) (2 diffs)

trunk/src/3rdparty/os2/xsystray/xsystray.c

@@ -431 +431 @@
             // advance the address (only if nobody has already done so -- they
             // could already commit more than we did)
-            __atomic_cmpxchg32((uint32_t *)&pHdr->ulNeedsCommit,
+            __atomic_cmpxchg32((uint32_t *)&pHdr->ulNeedsCommit,
                                ulNeedsCommit + 4096, ulNeedsCommit);
         }
 
-        if (__atomic_cmpxchg32((uint32_t *)ulCurr, pIconData->hwnd, NULLHANDLE))
+        if (__atomic_cmpxchg32((volatile uint32_t *)ulCurr,
+                               pIconData->hwnd, NULLHANDLE))
             break;
 
@@ -460 +461 @@
 
     // store the new next address until someone else has already done that
-    __atomic_cmpxchg32((uint32_t *)&pHdr->ulNext, ulCurr, ulNext);
+    __atomic_cmpxchg32((uint32_t *)&pHdr->ulNext, ulCurr, ulNext);
 
     // fill in parts of the allocated NOTIFYDATA

trunk/src/3rdparty/os2/xsystray/xsystray_api.c

@@ -88 +88 @@
             bTriedFind = TRUE;
             HWND hwnd = FindSysTrayServerWindow();
-            __atomic_cmpxchg32((uint32_t *)&G_hwndSysTray, hwnd, NULLHANDLE);
+            __atomic_cmpxchg32((volatile uint32_t *)&G_hwndSysTray,
+                               hwnd, NULLHANDLE);
             if (G_hwndSysTray == NULLHANDLE)
                 break;
@@ -148 +149 @@
                                DOSSUB_INIT | DOSSUB_SPARSE_OBJ,
                                CLIENT_MEMORYPOOL_SIZE);
-        if (!__atomic_cmpxchg32((uint32_t *)&G_pvMemoryPool,
+        if (!__atomic_cmpxchg32((uint32_t *)&G_pvMemoryPool,
                                 (uint32_t)pvPool, (uint32_t)NULL))
         {