Changeset 7201 in vbox for trunk/src/VBox

Timestamp:

Feb 28, 2008 3:33:44 PM (17 years ago)

Author:

vboxsync

Message:

Runtime/Common: strformattype.cpp has to be compilable by a C compiler too, as it is built as part of the Guest Additions kernel module on Linux guests

File:

• trunk/src/VBox/Runtime/common/string/strformattype.cpp (modified) (7 diffs)

trunk/src/VBox/Runtime/common/string/strformattype.cpp

@@ -112 +112 @@
     if (RT_UNLIKELY(!ASMAtomicCmpXchgS32(&g_i32Spinlock, -RTSTRFORMATTYPE_LOCK_OFFSET, 0)))
     {
+        unsigned volatile i;
         AssertFailed();
-        for (unsigned volatile i = 0;; i++)
+        for (i = 0;; i++)
             if (    !g_i32Spinlock
                 &&  ASMAtomicCmpXchgS32(&g_i32Spinlock, -RTSTRFORMATTYPE_LOCK_OFFSET, 0))
@@ -144 +145 @@
     if (RT_UNLIKELY(ASMAtomicIncS32(&g_i32Spinlock) < 0))
     {
+        unsigned volatile i;
         AssertFailed();
-        for (unsigned volatile i = 0;; i++)
+        for (i = 0;; i++)
             if (ASMAtomicUoReadS32(&g_i32Spinlock) > 0)
                 break;
@@ -242 +244 @@
 RTDECL(int) RTStrFormatTypeRegister(const char *pszType, PFNRTSTRFORMATTYPE pfnHandler, void *pvUser)
 {
+    size_t cchType;
+    int rc;
+    uint32_t cTypes;
     /*
      * Validate input.
@@ -247 +252 @@
     AssertPtr(pfnHandler);
     AssertPtr(pszType);
-    const size_t cchType = strlen(pszType);
+    cchType = strlen(pszType);
     AssertReturn(cchType < RT_SIZEOFMEMB(RTSTRDYNFMT, szType), VERR_INVALID_PARAMETER);
 
@@ -256 +261 @@
 
     /* check that there are empty slots. */
-    int rc;
-    uint32_t const cTypes = g_cTypes;
+    cTypes = g_cTypes;
     if (cTypes < RT_ELEMENTS(g_aTypes))
     {
@@ -318 +322 @@
 RTDECL(int) RTStrFormatTypeDeregister(const char *pszType)
 {
+    uint32_t i;
     /*
      * Validate input.
@@ -327 +332 @@
      */
     rtstrFormatTypeWriteLock();
-    int32_t i = rtstrFormatTypeLookup(pszType, strlen(pszType));
+    i = rtstrFormatTypeLookup(pszType, strlen(pszType));
     if (i >= 0)
     {