From 7ad4e85d6444ab6f6ddd40819bb88148c2512d47 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 9 May 2014 21:02:08 +0200 Subject: [PATCH] Let configure build again (and removed hack for configArray) --- src/configure.h | 4 +++- src/makefile.c | 4 +--- src/makefile.h | 10 +--------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/configure.h b/src/configure.h index ded0a12..bf1c2ff 100644 --- a/src/configure.h +++ b/src/configure.h @@ -1,5 +1,5 @@ /* $Id$ */ -/* Copyright (c) 2006-2013 Pierre Pronchery */ +/* Copyright (c) 2006-2014 Pierre Pronchery */ /* This file is part of DeforaOS Devel configure */ /* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,8 @@ /* types */ +ARRAY(Config *, config) + typedef struct _EnumMap { unsigned int value; diff --git a/src/makefile.c b/src/makefile.c index 97841c2..825a0ca 100644 --- a/src/makefile.c +++ b/src/makefile.c @@ -1,5 +1,5 @@ /* $Id$ */ -/* Copyright (c) 2006-2013 Pierre Pronchery */ +/* Copyright (c) 2006-2014 Pierre Pronchery */ /* This file is part of DeforaOS Devel configure */ /* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,8 +25,6 @@ #include "configure.h" #include "../config.h" -ARRAY(Config *, config) - /* prototypes */ static int _makefile_output_variable(FILE * fp, char const * name, diff --git a/src/makefile.h b/src/makefile.h index 1017c21..93f3175 100644 --- a/src/makefile.h +++ b/src/makefile.h @@ -1,5 +1,5 @@ /* $Id$ */ -/* Copyright (c) 2009 Pierre Pronchery */ +/* Copyright (c) 2006-2014 Pierre Pronchery */ /* This file is part of DeforaOS Devel configure */ /* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,14 +22,6 @@ # include "configure.h" -/* types */ -/* FIXME should be: -ARRAY(Config *, config); -but it can't be included multiple times */ -typedef Array configArray; -extern configArray * configarray_new(void); - - /* functions */ int makefile(Configure * configure, String const * directory, configArray * ca, int from, int to);