From 55be6c01c1ff0830eb948602c09dbb9f4344e466 Mon Sep 17 00:00:00 2001 From: mquinson Date: Fri, 16 Mar 2007 14:59:14 +0000 Subject: [PATCH] Rework the portability layer around our getline definition. Damn thing. A proper xbt_string.h is needed, but it's too late for this version of simgrid git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3306 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/xbt/sysdep.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h index 41708e07c6..524bfb2bff 100644 --- a/include/xbt/sysdep.h +++ b/include/xbt/sysdep.h @@ -26,16 +26,10 @@ extern int asprintf (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRI extern int vasprintf (char **ptr, const char *fmt, va_list ap); XBT_PUBLIC(char*) bprintf (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2); - -#if ((defined (_MSC_VER) || defined(__BORLANDC__)) && !defined(SSIZE_T_DEFINED)) -typedef int ssize_t; -#define SSIZE_T_DEFINED +#if defined(_WIN32) || !defined(__GNUC__) +XBT_PUBLIC(long) getline(char **lineptr, size_t *n, FILE *stream); #endif -/* FIXME: ssize_t must be 'long' on windows, no idea whether we should define this explicitly */ -XBT_PUBLIC(ssize_t) getline(char **lineptr, size_t *n, FILE *stream); - - /* They live in asserts.h, but need to be declared before this module. double declaration to cut dependency cycle */ /** -- 2.20.1