A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MSVC] don't whine on fopen being insecure
[simgrid.git]
/
include
/
xbt
/
sysdep.h
diff --git
a/include/xbt/sysdep.h
b/include/xbt/sysdep.h
index
48476d9
..
d127bec
100644
(file)
--- a/
include/xbt/sysdep.h
+++ b/
include/xbt/sysdep.h
@@
-2,7
+2,7
@@
/* no system header should be loaded out of this file so that we have only */
/* one file to check when porting to another OS */
/* no system header should be loaded out of this file so that we have only */
/* one file to check when porting to another OS */
-/* Copyright (c) 2004-201
4
. The SimGrid Team.
+/* Copyright (c) 2004-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-21,12
+21,12
@@
#include "simgrid_config.h"
#include "simgrid_config.h"
+SG_BEGIN_DECL()
+
#include <string.h>
#include <stdlib.h>
#include <stdarg.h> /* va_list */
#include <string.h>
#include <stdlib.h>
#include <stdarg.h> /* va_list */
-SG_BEGIN_DECL()
-
/* They live in asserts.h, but need to be declared before this module.
double declaration to cut dependency cycle */
/**
/* They live in asserts.h, but need to be declared before this module.
double declaration to cut dependency cycle */
/**
@@
-71,11
+71,15
@@
XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
* @{
*/
* @{
*/
-#if defined(__GNUC__) || defined(DOXYGEN)
+#ifdef _MSC_VER /* Microsoft wants to improve the code quality blah blah blah */
+/* warning C4996: '_strdup': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _strdup. */
+# define strdup _strdup
+/* warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. */
+# define _CRT_SECURE_NO_WARNINGS
+#endif
+
/** @brief Like strdup, but xbt_die() on error */
/** @brief Like strdup, but xbt_die() on error */
-static inline __attribute__ ((always_inline))
-char *xbt_strdup(const char *s)
-{
+static XBT_ALWAYS_INLINE char *xbt_strdup(const char *s) {
char *res = NULL;
if (s) {
res = strdup(s);
char *res = NULL;
if (s) {
res = strdup(s);
@@
-89,9
+93,7
@@
XBT_PUBLIC(void) xbt_backtrace_display_current(void);
/** @brief Like malloc, but xbt_die() on error
@hideinitializer */
/** @brief Like malloc, but xbt_die() on error
@hideinitializer */
-static inline __attribute__ ((always_inline))
-void *xbt_malloc(size_t n)
-{
+static XBT_ALWAYS_INLINE void *xbt_malloc(size_t n) {
void *res;
/* if (n==0) {
xbt_backtrace_display_current();
void *res;
/* if (n==0) {
xbt_backtrace_display_current();
@@
-106,9
+108,7
@@
void *xbt_malloc(size_t n)
/** @brief like malloc, but xbt_die() on error and memset data to 0
@hideinitializer */
/** @brief like malloc, but xbt_die() on error and memset data to 0
@hideinitializer */
-static inline __attribute__ ((always_inline))
-void *xbt_malloc0(size_t n)
-{
+static XBT_ALWAYS_INLINE void *xbt_malloc0(size_t n) {
void *res;
//if (n==0) xbt_die("calloc(0) is not portable");
res = calloc(n, 1);
void *res;
//if (n==0) xbt_die("calloc(0) is not portable");
res = calloc(n, 1);
@@
-119,9
+119,7
@@
void *xbt_malloc0(size_t n)
/** @brief like realloc, but xbt_die() on error
@hideinitializer */
/** @brief like realloc, but xbt_die() on error
@hideinitializer */
-static inline __attribute__ ((always_inline))
-void *xbt_realloc(void *p, size_t s)
-{
+static XBT_ALWAYS_INLINE void *xbt_realloc(void *p, size_t s) {
void *res = NULL;
//if (s==0) xbt_die("realloc(0) is not portable");
if (s) {
void *res = NULL;
//if (s==0) xbt_die("realloc(0) is not portable");
if (s) {
@@
-137,12
+135,6
@@
void *xbt_realloc(void *p, size_t s)
}
return res;
}
}
return res;
}
-#else /* non __GNUC__ */
-# define xbt_strdup(s) strdup(s)
-# define xbt_malloc(n) malloc(n)
-# define xbt_malloc0(n) calloc(n,1)
-# define xbt_realloc(p,s) realloc(p,s)
-#endif /* __GNUC__ ? */
/** @brief like free
@hideinitializer */
/** @brief like free
@hideinitializer */