#include <grub/command.h>
#include <grub/i18n.h>
-#if defined (GRUB_MACHINE_EMU)
-#include <grub/emu/misc.h>
-#endif
-
static struct grub_parttool *parts = 0;
static int curhandle = 0;
static grub_dl_t mymod;
}
/* Load modules. */
-#if defined(GRUB_MACHINE_EMU)
if (! grub_no_autoload)
-#endif
{
const char *prefix;
prefix = grub_env_get ("prefix");
int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
void EXPORT_FUNC(grub_dl_iterate) (int (*hook) (grub_dl_t mod));
grub_dl_t EXPORT_FUNC(grub_dl_get) (const char *name);
-grub_err_t EXPORT_FUNC(grub_dl_register_symbol) (const char *name, void *addr,
- grub_dl_t mod);
+grub_err_t grub_dl_register_symbol (const char *name, void *addr,
+ grub_dl_t mod);
grub_err_t grub_arch_dl_check_header (void *ehdr);
grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
-#if defined (_mips) && (! defined (GRUB_MACHINE_EMU) || ! GRUB_MACHINE_EMU)
+#if defined (_mips)
#define GRUB_LINKER_HAVE_INIT 1
void grub_arch_dl_init_linker (void);
#endif
char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
extern char * canonicalize_file_name (const char *path);
-/* Flag to control module autoloading in normal mode. */
-extern int EXPORT_VAR(grub_no_autoload);
-
#endif /* GRUB_EMU_MISC_H */
void EXPORT_FUNC (grub_halt) (void);
#endif
+#ifdef GRUB_MACHINE_EMU
+/* Flag to control module autoloading in normal mode. */
+extern int EXPORT_VAR(grub_no_autoload);
+#else
+#define grub_no_autoload 0
+#endif
+
#endif /* ! GRUB_MISC_HEADER */
/* Store the prefix specified by an argument. */
static char *prefix = NULL;
-/* Flag to control module autoloading in normal mode. */
int grub_no_autoload;
grub_addr_t
#include <grub/i18n.h>
#include <grub/charset.h>
-#if defined (GRUB_MACHINE_EMU)
-#include <grub/emu/misc.h>
-#endif
-
#define GRUB_DEFAULT_HISTORY_SIZE 50
static int nested_level = 0;
static void
read_lists (const char *val)
{
-#if defined(GRUB_MACHINE_EMU)
if (! grub_no_autoload)
-#endif
{
read_command_list (val);
read_fs_list (val);