-/* @(#) $Id: mem_op.h,v 1.6 2009/06/24 17:06:26 dcid Exp $ */
-
/* Copyright (C) 2009 Trend Micro Inc.
* All right reserved.
*
* This program is a free software; you can redistribute it
* and/or modify it under the terms of the GNU General Public
- * License (version 3) as published by the FSF - Free Software
+ * License (version 2) as published by the FSF - Free Software
* Foundation
*/
-
#ifndef __MEM_H
-
#define __MEM_H
-#include "shared.h"
+#include <stdlib.h>
-void os_FreeArray(char *ch1, char **ch2);
-int os_IsStrOnArray(char *str, char **array);
-char *os_LoadString(char *at, char *str);
+void **os_AddPtArray(void *pt, void **array);
+char **os_AddStrArray(const char *str, char **array);
+void os_FreeArray(char *ch1, char **ch2);
+int os_IsStrOnArray(const char *str, char **array);
+char *os_LoadString(char *at, const char *str) __attribute__((nonnull(2)));
+void *memset_secure(void *v, int c, size_t n) __attribute__((nonnull));
#endif
+