X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ShellPkg%2FInclude%2FShellBase.h;h=09f87b4cc0942e1ea200980639e8269df4d54e2a;hb=fbd2dfadfe6fb16ab7b49fca3764e05e65d97b8a;hp=b76438152266fc42f47e87208b4852f2c7302438;hpb=fbec9c0f1c819de0d0d2fa61025258dcda471071;p=mirror_edk2.git

diff --git a/ShellPkg/Include/ShellBase.h b/ShellPkg/Include/ShellBase.h
index b764381522..09f87b4cc0 100644
--- a/ShellPkg/Include/ShellBase.h
+++ b/ShellPkg/Include/ShellBase.h
@@ -1,7 +1,7 @@
 /** @file
   Root include file for Shell Package modules that utilize the SHELL_RETURN type
 
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -12,19 +12,18 @@
 
 **/
 
-#ifndef __SHELL_BASE__
-#define __SHELL_BASE__
+#ifndef _SHELL_BASE_
+#define _SHELL_BASE_
 
 typedef VOID *SHELL_FILE_HANDLE;
 
-#ifndef SHELL_FREE_NON_NULL
 #define SHELL_FREE_NON_NULL(Pointer)  \
   do {                                \
-    if (Pointer != NULL) {            \
-      FreePool(Pointer);              \
+    if ((Pointer) != NULL) {          \
+      FreePool((Pointer));            \
+      (Pointer) = NULL;               \
     }                                 \
   } while(FALSE)
-#endif //SHELL_FREE_NON_NULL
 
 typedef enum {
 ///
@@ -155,4 +154,4 @@ SHELL_SECURITY_VIOLATION    = 26,
 SHELL_NOT_EQUAL             = 27
 }SHELL_STATUS;
 
-#endif //__SHELL_BASE__
\ No newline at end of file
+#endif //__SHELL_BASE_