Let configure build again (and removed hack for configArray)
This commit is contained in:
parent
fe5484711d
commit
7ad4e85d64
@ -1,5 +1,5 @@
|
|||||||
/* $Id$ */
|
/* $Id$ */
|
||||||
/* Copyright (c) 2006-2013 Pierre Pronchery <khorben@defora.org> */
|
/* Copyright (c) 2006-2014 Pierre Pronchery <khorben@defora.org> */
|
||||||
/* This file is part of DeforaOS Devel configure */
|
/* This file is part of DeforaOS Devel configure */
|
||||||
/* This program is free software: you can redistribute it and/or modify
|
/* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -22,6 +22,8 @@
|
|||||||
|
|
||||||
|
|
||||||
/* types */
|
/* types */
|
||||||
|
ARRAY(Config *, config)
|
||||||
|
|
||||||
typedef struct _EnumMap
|
typedef struct _EnumMap
|
||||||
{
|
{
|
||||||
unsigned int value;
|
unsigned int value;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* $Id$ */
|
/* $Id$ */
|
||||||
/* Copyright (c) 2006-2013 Pierre Pronchery <khorben@defora.org> */
|
/* Copyright (c) 2006-2014 Pierre Pronchery <khorben@defora.org> */
|
||||||
/* This file is part of DeforaOS Devel configure */
|
/* This file is part of DeforaOS Devel configure */
|
||||||
/* This program is free software: you can redistribute it and/or modify
|
/* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -25,8 +25,6 @@
|
|||||||
#include "configure.h"
|
#include "configure.h"
|
||||||
#include "../config.h"
|
#include "../config.h"
|
||||||
|
|
||||||
ARRAY(Config *, config)
|
|
||||||
|
|
||||||
|
|
||||||
/* prototypes */
|
/* prototypes */
|
||||||
static int _makefile_output_variable(FILE * fp, char const * name,
|
static int _makefile_output_variable(FILE * fp, char const * name,
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* $Id$ */
|
/* $Id$ */
|
||||||
/* Copyright (c) 2009 Pierre Pronchery <khorben@defora.org> */
|
/* Copyright (c) 2006-2014 Pierre Pronchery <khorben@defora.org> */
|
||||||
/* This file is part of DeforaOS Devel configure */
|
/* This file is part of DeforaOS Devel configure */
|
||||||
/* This program is free software: you can redistribute it and/or modify
|
/* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -22,14 +22,6 @@
|
|||||||
# include "configure.h"
|
# 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 */
|
/* functions */
|
||||||
int makefile(Configure * configure, String const * directory, configArray * ca,
|
int makefile(Configure * configure, String const * directory, configArray * ca,
|
||||||
int from, int to);
|
int from, int to);
|
||||||
|
Loading…
Reference in New Issue
Block a user