Now check to see if we have config.h *AND* it hasn't been included before.
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
$Id: cdio_private.h,v 1.30 2006/01/23 20:31:35 rocky Exp $
|
$Id: cdio_private.h,v 1.31 2006/01/23 20:48:11 rocky Exp $
|
||||||
|
|
||||||
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
|
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
|
||||||
|
|
||||||
@@ -24,6 +24,10 @@
|
|||||||
#ifndef __CDIO_PRIVATE_H__
|
#ifndef __CDIO_PRIVATE_H__
|
||||||
#define __CDIO_PRIVATE_H__
|
#define __CDIO_PRIVATE_H__
|
||||||
|
|
||||||
|
#if defined(HAVE_CONFIG_H) && !defined(LIBCDIO_CONFIG_H)
|
||||||
|
# include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <cdio/cdio.h>
|
#include <cdio/cdio.h>
|
||||||
#include <cdio/audio.h>
|
#include <cdio/audio.h>
|
||||||
#include <cdio/cdtext.h>
|
#include <cdio/cdtext.h>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
$Id: generic.h,v 1.14 2005/04/23 01:16:19 rocky Exp $
|
$Id: generic.h,v 1.15 2006/01/23 20:48:11 rocky Exp $
|
||||||
|
|
||||||
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
|
Copyright (C) 2004, 2005, 2006 Rocky Bernstein <rocky@panix.com>
|
||||||
|
|
||||||
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
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
#ifndef __CDIO_GENERIC_H__
|
#ifndef __CDIO_GENERIC_H__
|
||||||
#define __CDIO_GENERIC_H__
|
#define __CDIO_GENERIC_H__
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#if defined(HAVE_CONFIG_H) && !defined(LIBCDIO_CONFIG_H)
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user