From 67acca9238ce9a4f769c7c11689d974066b4abe7 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Tue, 21 Oct 2008 08:40:54 +0000 Subject: [PATCH] move header files from embryo_private.h to source files SVN revision: 36915 --- legacy/embryo/src/lib/embryo_amx.c | 10 +++++++++ legacy/embryo/src/lib/embryo_args.c | 22 +++++++++++++++++++ legacy/embryo/src/lib/embryo_float.c | 7 +++++++ legacy/embryo/src/lib/embryo_main.c | 9 +++++++- legacy/embryo/src/lib/embryo_private.h | 29 -------------------------- legacy/embryo/src/lib/embryo_rand.c | 7 +++++++ legacy/embryo/src/lib/embryo_str.c | 11 +++++++++- legacy/embryo/src/lib/embryo_time.c | 12 ++++++++--- 8 files changed, 73 insertions(+), 34 deletions(-) diff --git a/legacy/embryo/src/lib/embryo_amx.c b/legacy/embryo/src/lib/embryo_amx.c index 8b4325ca42..9ae5929a5c 100644 --- a/legacy/embryo/src/lib/embryo_amx.c +++ b/legacy/embryo/src/lib/embryo_amx.c @@ -24,8 +24,18 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include + +#include "Embryo.h" #include "embryo_private.h" + #define JUMPABS(base, ip) ((Embryo_Cell *)(code + (*ip))) #ifdef WORDS_BIGENDIAN diff --git a/legacy/embryo/src/lib/embryo_args.c b/legacy/embryo/src/lib/embryo_args.c index b7456f4cce..cdf4940cd4 100644 --- a/legacy/embryo/src/lib/embryo_args.c +++ b/legacy/embryo/src/lib/embryo_args.c @@ -2,6 +2,28 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef HAVE_ALLOCA_H +# include +#elif defined __GNUC__ +# define alloca __builtin_alloca +#elif defined _AIX +# define alloca __alloca +#elif defined _MSC_VER +# include +# define alloca _alloca +#else +# include +# ifdef __cplusplus +extern "C" +# endif +void *alloca (size_t); +#endif + +#include "Embryo.h" #include "embryo_private.h" #define STRSET(ep, par, str) { \ diff --git a/legacy/embryo/src/lib/embryo_float.c b/legacy/embryo/src/lib/embryo_float.c index af241b6523..f69ecd0ba2 100644 --- a/legacy/embryo/src/lib/embryo_float.c +++ b/legacy/embryo/src/lib/embryo_float.c @@ -40,7 +40,14 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include + +#include "Embryo.h" #include "embryo_private.h" #define PI 3.1415926535897932384626433832795 diff --git a/legacy/embryo/src/lib/embryo_main.c b/legacy/embryo/src/lib/embryo_main.c index 48f5ba862e..69da2cc725 100644 --- a/legacy/embryo/src/lib/embryo_main.c +++ b/legacy/embryo/src/lib/embryo_main.c @@ -2,9 +2,16 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#include "embryo_private.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include +#include "Embryo.h" +#include "embryo_private.h" + static int _embryo_init_count = 0; /*** EXPORTED CALLS ***/ diff --git a/legacy/embryo/src/lib/embryo_private.h b/legacy/embryo/src/lib/embryo_private.h index a88cd26f8e..a4f4d57848 100644 --- a/legacy/embryo/src/lib/embryo_private.h +++ b/legacy/embryo/src/lib/embryo_private.h @@ -1,38 +1,9 @@ #ifndef _EMBRYO_PRIVATE_H #define _EMBRYO_PRIVATE_H -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif #include -#include "Embryo.h" #ifdef __GNUC__ # if __GNUC__ >= 4 diff --git a/legacy/embryo/src/lib/embryo_rand.c b/legacy/embryo/src/lib/embryo_rand.c index 16025b73bf..a759077d47 100644 --- a/legacy/embryo/src/lib/embryo_rand.c +++ b/legacy/embryo/src/lib/embryo_rand.c @@ -2,6 +2,13 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include "Embryo.h" #include "embryo_private.h" /* exported random number api */ diff --git a/legacy/embryo/src/lib/embryo_str.c b/legacy/embryo/src/lib/embryo_str.c index 2ed03c7a75..8781cfd99e 100644 --- a/legacy/embryo/src/lib/embryo_str.c +++ b/legacy/embryo/src/lib/embryo_str.c @@ -2,9 +2,18 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#include "embryo_private.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include #include +#include "Embryo.h" +#include "embryo_private.h" + #define STRGET(ep, str, par) { \ Embryo_Cell *___cptr; \ str = NULL; \ diff --git a/legacy/embryo/src/lib/embryo_time.c b/legacy/embryo/src/lib/embryo_time.c index a05441ea6c..97c28f1daa 100644 --- a/legacy/embryo/src/lib/embryo_time.c +++ b/legacy/embryo/src/lib/embryo_time.c @@ -2,14 +2,20 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#include "embryo_private.h" -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #ifndef HAVE_GETTIMEOFDAY # error "Your platform isn't supported yet" #endif +#include +#include + +#include "Embryo.h" +#include "embryo_private.h" + /* exported time api */ static Embryo_Cell