From c2388105c4336236caaf7d9b4053b3317223e789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 28 Nov 2013 11:11:26 +0000 Subject: [PATCH] Build fix for getopt.h on Apple. (Thanks to Adam Vandenberg for the fix) git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@978 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Tools/Utils/getopt.h | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/OpenMesh/Tools/Utils/getopt.h b/src/OpenMesh/Tools/Utils/getopt.h index df0d7e01..a156402e 100644 --- a/src/OpenMesh/Tools/Utils/getopt.h +++ b/src/OpenMesh/Tools/Utils/getopt.h @@ -5,23 +5,26 @@ #include #if defined(WIN32) -#if defined(__cplusplus) + #if defined(__cplusplus) + + extern "C" { + + extern OPENMESHDLLEXPORT int opterr; + extern OPENMESHDLLEXPORT int optind; + extern OPENMESHDLLEXPORT int optopt; + extern OPENMESHDLLEXPORT int optreset; + extern OPENMESHDLLEXPORT char *optarg; -extern "C" { + OPENMESHDLLEXPORT extern int getopt(int nargc, char * const *nargv, const char *ostr); -extern OPENMESHDLLEXPORT int opterr; -extern OPENMESHDLLEXPORT int optind; -extern OPENMESHDLLEXPORT int optopt; -extern OPENMESHDLLEXPORT int optreset; -extern OPENMESHDLLEXPORT char *optarg; + } -OPENMESHDLLEXPORT extern int getopt(int nargc, char * const *nargv, const char *ostr); + #endif -} - -# endif +#elif defined __APPLE__ + #include #else -# include + #include #endif #endif /* _GETOPT_H_ */