mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-21 06:01:13 +02:00
Avoid multiple include of configunix.h
This commit is contained in:
@@ -249,6 +249,7 @@ typedef enum
|
|||||||
// it ugly, but a part of the game. Remove it when
|
// it ugly, but a part of the game. Remove it when
|
||||||
// the API is complete.
|
// the API is complete.
|
||||||
|
|
||||||
|
|
||||||
#if !defined(AUDACITY_DLL_API)
|
#if !defined(AUDACITY_DLL_API)
|
||||||
// This was copied from "Audacity.h" so these headers wouldn't have
|
// This was copied from "Audacity.h" so these headers wouldn't have
|
||||||
// to include it.
|
// to include it.
|
||||||
@@ -273,7 +274,10 @@ typedef enum
|
|||||||
#endif //_MSC_VER
|
#endif //_MSC_VER
|
||||||
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#include "configunix.h"
|
#ifndef __CONFIG_UNIX_INCLUDED
|
||||||
|
#define __CONFIG_UNIX_INCLUDED
|
||||||
|
#include "configunix.h"
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The GCC-elf implementation */
|
/* The GCC-elf implementation */
|
||||||
|
@@ -124,7 +124,11 @@ void QuitAudacity();
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __WXGTK__
|
#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
|
// Some systems do not restrict the path length and therefore PATH_MAX is undefined
|
||||||
#ifdef PATH_MAX
|
#ifdef PATH_MAX
|
||||||
#undef PLATFORM_MAX_PATH
|
#undef PLATFORM_MAX_PATH
|
||||||
@@ -133,7 +137,10 @@ void QuitAudacity();
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __WXX11__
|
#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.
|
// wxX11 should also get the platform-specific definition of PLATFORM_MAX_PATH, so do not declare here.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user