Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: third_party/lzma_sdk/Alloc.h

Issue 1700453002: Update lzma_sdk sources to 15.14. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Chromium modifications Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/lzma_sdk/7zTypes.h ('k') | third_party/lzma_sdk/Alloc.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/lzma_sdk/Alloc.h
diff --git a/third_party/lzma_sdk/Alloc.h b/third_party/lzma_sdk/Alloc.h
index b8e4143677da1753237f41a27acb1c6a425466a5..bac0d87e2a0c38e525fbfff04e2762fbeb10cd06 100644
--- a/third_party/lzma_sdk/Alloc.h
+++ b/third_party/lzma_sdk/Alloc.h
@@ -1,14 +1,12 @@
/* Alloc.h -- Memory allocation functions
-2009-02-07 : Igor Pavlov : Public domain */
+2015-02-21 : Igor Pavlov : Public domain */
#ifndef __COMMON_ALLOC_H
#define __COMMON_ALLOC_H
-#include <stddef.h>
+#include "7zTypes.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+EXTERN_C_BEGIN
void *MyAlloc(size_t size);
void MyFree(void *address);
@@ -31,8 +29,9 @@ void BigFree(void *address);
#endif
-#ifdef __cplusplus
-}
-#endif
+extern ISzAlloc g_Alloc;
+extern ISzAlloc g_BigAlloc;
+
+EXTERN_C_END
#endif
« no previous file with comments | « third_party/lzma_sdk/7zTypes.h ('k') | third_party/lzma_sdk/Alloc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698