diff options
| author | Pawel Kowalski <p.kowalski2@partner.samsung.com> | 2018-06-15 11:24:08 +0200 |
|---|---|---|
| committer | Pawel Kowalski <p.kowalski2@partner.samsung.com> | 2018-06-15 11:26:09 +0200 |
| commit | 5c7e0aaf17a296535495e3431db6a86ad64064b3 (patch) | |
| tree | d7cca0250c60fbc69eb70a7039d0f9659f81b9d0 /gl/getopt.in.h | |
| parent | 1701584f7841a79ae4e97699a8c4ac9f0a09c38f (diff) | |
| parent | e527f54afdf27ab8ce73a22d05d69e5482f5e92b (diff) | |
| download | libtasn1-5c7e0aaf17a296535495e3431db6a86ad64064b3.tar.gz libtasn1-5c7e0aaf17a296535495e3431db6a86ad64064b3.tar.bz2 libtasn1-5c7e0aaf17a296535495e3431db6a86ad64064b3.zip | |
Merge branch 'upstream' into tizensubmit/tizen_5.0/20181101.000007submit/tizen/20180615.093304accepted/tizen/unified/20180620.131427accepted/tizen/5.0/unified/20181102.030257
Change-Id: I254f6095d312777427a57af3ed346986a28f3aaa
Diffstat (limited to 'gl/getopt.in.h')
| -rw-r--r-- | gl/getopt.in.h | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/gl/getopt.in.h b/gl/getopt.in.h index 7ab99fb..6cbad8e 100644 --- a/gl/getopt.in.h +++ b/gl/getopt.in.h @@ -1,5 +1,5 @@ /* Declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2014 Free Software + Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -47,15 +47,20 @@ identifiers so that they do not collide with the system functions and variables. Renaming avoids problems with some compilers and linkers. */ -#if defined __GETOPT_PREFIX && !defined __need_getopt -# if !@HAVE_GETOPT_H@ -# define __need_system_stdlib_h -# include <stdlib.h> -# undef __need_system_stdlib_h -# include <stdio.h> -# include <unistd.h> +#if defined __GETOPT_PREFIX +# if !defined __need_getopt +# if !@HAVE_GETOPT_H@ +# define __need_system_stdlib_h +# include <stdlib.h> +# undef __need_system_stdlib_h +# include <stdio.h> +# include <unistd.h> +# endif +# undef __need_getopt # endif -# undef __need_getopt +# undef __GETOPT_CONCAT +# undef __GETOPT_XCONCAT +# undef __GETOPT_ID # undef getopt # undef getopt_long # undef getopt_long_only @@ -64,6 +69,7 @@ # undef optind # undef optopt # undef option +# undef _getopt_internal # define __GETOPT_CONCAT(x, y) x ## y # define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) # define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) |