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
Fix strdup/_strdup detection
[simgrid.git]
/
include
/
xbt
/
sysdep.h
diff --git
a/include/xbt/sysdep.h
b/include/xbt/sysdep.h
index
adc9022
..
f464edd
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
, 2005, 2006, 2007, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2004
-2014
. 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
@@
-11,16
+11,16
@@
#ifndef _XBT_SYSDEP_H
#define _XBT_SYSDEP_H
#ifndef _XBT_SYSDEP_H
#define _XBT_SYSDEP_H
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h> /* va_list */
-
#include "xbt/log.h"
#include "xbt/misc.h"
#include "xbt/asserts.h"
#include "simgrid_config.h"
#include "xbt/log.h"
#include "xbt/misc.h"
#include "xbt/asserts.h"
#include "simgrid_config.h"
+#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.
SG_BEGIN_DECL()
/* They live in asserts.h, but need to be declared before this module.
@@
-31,7
+31,7
@@
SG_BEGIN_DECL()
* @{
*/
/** @brief Kill the program in silence */
* @{
*/
/** @brief Kill the program in silence */
-#define xbt_abort() abort()
+XBT_PUBLIC(void) xbt_abort(void) _XBT_GNUC_NORETURN;
/**
* @brief Kill the program with an error message
/**
* @brief Kill the program with an error message
@@
-45,12
+45,13
@@
SG_BEGIN_DECL()
*/
#define xbt_die(...) \
do { \
*/
#define xbt_die(...) \
do { \
- XBT_LOG_EXTERNAL_CATEGORY(xbt); \
XBT_CCRITICAL(xbt, __VA_ARGS__); \
xbt_abort(); \
} while (0)
/** @} */
XBT_CCRITICAL(xbt, __VA_ARGS__); \
xbt_abort(); \
} while (0)
/** @} */
+XBT_LOG_EXTERNAL_CATEGORY(xbt);
+
/* these ones live in str.h, but redeclare them here so that we do
not need to load the whole str.h and its heavy dependencies */
#ifndef __USE_GNU /* do not redeclare existing headers */
/* these ones live in str.h, but redeclare them here so that we do
not need to load the whole str.h and its heavy dependencies */
#ifndef __USE_GNU /* do not redeclare existing headers */
@@
-73,7
+74,11
@@
char *xbt_strdup(const char *s)
{
char *res = NULL;
if (s) {
{
char *res = NULL;
if (s) {
+# if !defined(_XBT_WIN32)
res = strdup(s);
res = strdup(s);
+# else
+ res = _strdup(s);
+# endif
if (!res)
xbt_die("memory allocation error (strdup returned NULL)");
}
if (!res)
xbt_die("memory allocation error (strdup returned NULL)");
}
@@
-128,14
+133,16
@@
void *xbt_realloc(void *p, size_t s)
res = xbt_malloc(s);
}
} else {
res = xbt_malloc(s);
}
} else {
- if (p) {
- free(p);
- }
+ free(p);
}
return res;
}
#else /* non __GNUC__ */
}
return res;
}
#else /* non __GNUC__ */
-# define xbt_strdup(s) strdup(s)
+# if !defined(_XBT_WIN32)
+# define xbt_strdup(s) strdup(s)
+# else
+# define xbt_strdup(s) _strdup(s)
+# endif
# define xbt_malloc(n) malloc(n)
# define xbt_malloc0(n) calloc(n,1)
# define xbt_realloc(p,s) realloc(p,s)
# define xbt_malloc(n) malloc(n)
# define xbt_malloc0(n) calloc(n,1)
# define xbt_realloc(p,s) realloc(p,s)
@@
-143,8
+150,7
@@
void *xbt_realloc(void *p, size_t s)
/** @brief like free
@hideinitializer */
/** @brief like free
@hideinitializer */
-#define xbt_free free /*nothing specific to do here. A poor valgrind replacement? */
-/*#define xbt_free_fct free * replacement with the guareenty of being a function FIXME:KILLME*/
+#define xbt_free(p) free(p) /*nothing specific to do here. A poor valgrind replacement? */
/** @brief like free, but you can be sure that it is a function */
XBT_PUBLIC(void) xbt_free_f(void *p);
/** @brief like free, but you can be sure that it is a function */
XBT_PUBLIC(void) xbt_free_f(void *p);