Merge branch 'master' into gui-refactor

This commit is contained in:
aanper 2020-10-16 09:46:14 +03:00
commit d80e22a6c6

View File

@ -92,10 +92,10 @@
/* Memory management macros */ /* Memory management macros */
/** Alias for memory allocation. */ /** Alias for memory allocation. */
#define USBD_malloc malloc #define USBD_malloc USBD_static_malloc
/** Alias for memory release. */ /** Alias for memory release. */
#define USBD_free free #define USBD_free USBD_static_free
/** Alias for memory set. */ /** Alias for memory set. */
#define USBD_memset memset #define USBD_memset memset