ShellPkg/UefiShellLib: Remove unnecessary EFIAPI

[mirror_edk2.git] / ShellPkg / Include / ShellBase.h

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