Avoid multiple include of configunix.h

This commit is contained in:
James Crook 2018-04-06 10:14:47 +01:00
parent b24dae713b
commit 213daba23f
2 changed files with 14 additions and 3 deletions

View File

@ -249,6 +249,7 @@ typedef enum
// it ugly, but a part of the game. Remove it when
// the API is complete.
#if !defined(AUDACITY_DLL_API)
// This was copied from "Audacity.h" so these headers wouldn't have
// to include it.
@ -273,7 +274,10 @@ typedef enum
#endif //_MSC_VER
#ifdef __GNUC__
#include "configunix.h"
#ifndef __CONFIG_UNIX_INCLUDED
#define __CONFIG_UNIX_INCLUDED
#include "configunix.h"
#endif
#endif
/* The GCC-elf implementation */

View File

@ -124,7 +124,11 @@ void QuitAudacity();
#endif
#ifdef __WXGTK__
#include "configunix.h"
#ifndef __CONFIG_UNIX_INCLUDED
#define __CONFIG_UNIX_INCLUDED
#include "configunix.h"
#endif
// Some systems do not restrict the path length and therefore PATH_MAX is undefined
#ifdef PATH_MAX
#undef PLATFORM_MAX_PATH
@ -133,7 +137,10 @@ void QuitAudacity();
#endif
#ifdef __WXX11__
#include "configunix.h"
#ifndef __CONFIG_UNIX_INCLUDED
#define __CONFIG_UNIX_INCLUDED
#include "configunix.h"
#endif
// wxX11 should also get the platform-specific definition of PLATFORM_MAX_PATH, so do not declare here.
#endif