From a6d696b74adb08d83b21f8299b5443f31a5f43ec Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Wed, 31 Jan 2007 13:31:19 -0500 Subject: Small cleanup to prepare for cross-compile friendly make install. --- toys/toylist.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'toys/toylist.h') diff --git a/toys/toylist.h b/toys/toylist.h index 6914f4ee..d6b9866c 100644 --- a/toys/toylist.h +++ b/toys/toylist.h @@ -5,18 +5,10 @@ */ -// When #included from main.c, provide the guts for toy_list[] +// Provide function declarations and structs. Note that main.c #includes this +// file twice (with different macros) to populate toy_list[]. -#ifdef FROM_MAIN -#undef NEWTOY -#undef OLDTOY -#define NEWTOY(name, opts, flags) {#name, name##_main, opts, flags}, -#define OLDTOY(name, oldname, opts, flags) {#name, oldname##_main, opts, flags}, - -// When #included from toys.h, provide function declarations and structs. -// The #else is because main.c #includes this file twice. - -#else +#ifndef NEWTOY #define NEWTOY(name, opts, flags) int name##_main(void); #define OLDTOY(name, oldname, opts, flags) -- cgit v1.2.3