Kill gras/core.h by moving the last bits into gras.h directly

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1427 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/gras.h b/include/gras.h
index 17dffb2..0e8614a 100644 (file)
--- a/include/gras.h
+++ b/include/gras.h
@@ -12,7 +12,6 @@
 
 #include <xbt.h> /* our toolbox */
 
 
 #include <xbt.h> /* our toolbox */
 

-#include <gras/core.h> /* FIXME: killme */

 #include <gras/process.h>
 #include <gras/virtu.h>
 #include <gras/emul.h>
 #include <gras/process.h>
 #include <gras/virtu.h>
 #include <gras/emul.h>


@@ -22,4 +21,7 @@
 #include <gras/messages.h>
 #include <gras/timer.h>
 
 #include <gras/messages.h>
 #include <gras/timer.h>
 

+void gras_init(int *argc, char **argv);
+void gras_exit(void);
+

 #endif /* GRAS_H */
 #endif /* GRAS_H */

diff --git a/include/gras/core.h b/include/gras/core.h
deleted file mode 100644 (file)
index 3330561..0000000
--- a/include/gras/core.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $Id$                     */
-
-/* gras/core.h - Unsorted part of the GRAS public interface                 */
-
-/* Copyright (c) 2003, 2004 Martin Quinson. 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. */
-
-#ifndef GRAS_CORE_H
-#define GRAS_CORE_H
-
-#include <stddef.h>    /* offsetof() */
-#include <sys/types.h>  /* size_t */
-#include <stdarg.h>
-#include "xbt/misc.h"
-
-
-/* /\*! C++ users need love *\/ */
-/* #ifndef BEGIN_DECL */
-/* # ifdef __cplusplus */
-/* #  define BEGIN_DECL() extern "C" { */
-/* # else */
-/* #  define BEGIN_DECL()  */
-/* # endif */
-/* #endif */
-
-/* /\*! C++ users need love *\/ */
-/* #ifndef END_DECL */
-/* # ifdef __cplusplus */
-/* #  define END_DECL() } */
-/* # else */
-/* #  define END_DECL()  */
-/* # endif */
-/* #endif */
-/* /\* End of cruft for C++ *\/ */
-
-BEGIN_DECL()
-
-/* **************************************************************************
- * Garbage collection support
- * **************************************************************************/
-typedef enum { free_after_use, free_never } e_xbt_free_directive_t;
-
-void gras_init(int *argc,char **argv, const char *defaultlog);
-void gras_exit(void);
-
-END_DECL()
-
-#endif /* GRAS_CORE_H */
-