Changeset 4476 in vbox for trunk/src/VBox/Runtime/generic

Timestamp:

Sep 1, 2007 1:30:34 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

24075

Message:

fixed darwin and two really bad assertions.

File:

• trunk/src/VBox/Runtime/generic/env-generic.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/generic/env-generic.cpp

@@ -31 +31 @@
 #if !defined(RT_OS_WINDOWS)
 # include <unistd.h>
+#endif
+#ifdef RT_OS_DARWIN
+# include <crt_externs.h>
 #endif
 #if defined(RT_OS_SOLARIS)
@@ -290 +293 @@
 {
     AssertPtrReturn(pszVar, VERR_INVALID_POINTER);
-    AssertPtrReturn(*pszVar, VERR_INVALID_PARAMETER);
+    AssertReturn(*pszVar, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pszValue, VERR_INVALID_POINTER);
 
@@ -395 +398 @@
 {
     AssertPtrReturn(pszVar, VERR_INVALID_POINTER);
-    AssertPtrReturn(*pszVar, VERR_INVALID_PARAMETER);
+    AssertReturn(*pszVar, VERR_INVALID_PARAMETER);
 
     int rc;