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
sys/time.h is always defined nowadays
[simgrid.git]
/
src
/
portable.h
diff --git
a/src/portable.h
b/src/portable.h
index
487a6f1
..
4866871
100644
(file)
--- a/
src/portable.h
+++ b/
src/portable.h
@@
-1,8
+1,6
@@
-/* portable -- header loading to write portable code */
-/* loads much more stuff than sysdep.h since the latter is in public interface*/
+/* portable -- header loading to write portable code within SimGrid */
-/* Copyright (c) 2004-2010, 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004, 2016. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-15,17
+13,13
@@
#include "xbt/base.h"
#include "xbt/misc.h"
#include "xbt/base.h"
#include "xbt/misc.h"
-#ifdef _
XBT_
WIN32
+#ifdef _WIN32
# include <windows.h>
#endif
#include <stdarg.h>
#include <stdio.h>
# include <windows.h>
#endif
#include <stdarg.h>
#include <stdio.h>
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
@@
-37,13
+31,11
@@
# include <sys/sysctl.h>
#endif
# include <sys/sysctl.h>
#endif
-/****
- **** File handling
- ****/
+/* File handling */
#include <fcntl.h>
#include <fcntl.h>
-#ifdef _
XBT_
WIN32
+#ifdef _WIN32
#ifndef EWOULDBLOCK
#define EWOULDBLOCK WSAEWOULDBLOCK
#endif
#ifndef EWOULDBLOCK
#define EWOULDBLOCK WSAEWOULDBLOCK
#endif
@@
-67,26
+59,15
@@
#define S_IWGRP 0
#endif
#define S_IWGRP 0
#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-
#ifndef O_BINARY
# define O_BINARY 0
#endif
#ifndef O_BINARY
# define O_BINARY 0
#endif
-/****
- **** Time handling
- ****/
-
-#if HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
+/* Time handling */
+#include <sys/time.h>
#include <time.h>
#include <time.h>
-/****
- **** Signals
- ****/
+/* Signals */
#ifdef HAVE_SIGNAL_H
# include <signal.h>
#endif
#ifdef HAVE_SIGNAL_H
# include <signal.h>
#endif