1*** gnulib/lib/getopt_.h 2005-09-23 06:15:13.000000000 +0200 2--- gettext-tools/lib/getopt_.h 2006-04-24 03:08:25.000000000 +0200 3*************** 4*** 1,5 **** 5 /* Declarations for getopt. 6! Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2005 7 Free Software Foundation, Inc. 8 This file is part of the GNU C Library. 9 10--- 1,5 ---- 11 /* Declarations for getopt. 12! Copyright (C) 1989-1994,1996-1999,2001,2003-2006 13 Free Software Foundation, Inc. 14 This file is part of the GNU C Library. 15 16*************** 17*** 23,28 **** 18--- 23,36 ---- 19 # define _GETOPT_H 1 20 #endif 21 22+ /* Ensure that DLL_VARIABLE is defined. Since on OSF/1 4.0 and Irix 6.5 23+ <stdlib.h> includes <getopt.h>, and <config.h> is not a prerequisite for 24+ using <stdlib.h>, this file can be included without a prior 25+ "#include <config.h>". */ 26+ #ifdef HAVE_CONFIG_H 27+ # include <config.h> 28+ #endif 29+ 30 /* Standalone applications should #define __GETOPT_PREFIX to an 31 identifier that prefixes the external functions and variables 32 defined in this header. When this happens, include the 33*************** 34*** 111,117 **** 35 Also, when `ordering' is RETURN_IN_ORDER, 36 each non-option ARGV-element is returned here. */ 37 38! extern char *optarg; 39 40 /* Index in ARGV of the next element to be scanned. 41 This is used for communication to and from the caller 42--- 119,125 ---- 43 Also, when `ordering' is RETURN_IN_ORDER, 44 each non-option ARGV-element is returned here. */ 45 46! extern DLL_VARIABLE char *optarg; 47 48 /* Index in ARGV of the next element to be scanned. 49 This is used for communication to and from the caller 50*************** 51*** 125,140 **** 52 Otherwise, `optind' communicates from one call to the next 53 how much of ARGV has been scanned so far. */ 54 55! extern int optind; 56 57 /* Callers store zero here to inhibit the error message `getopt' prints 58 for unrecognized options. */ 59 60! extern int opterr; 61 62 /* Set to an option character which was unrecognized. */ 63 64! extern int optopt; 65 66 #ifndef __need_getopt 67 /* Describe the long-named options requested by the application. 68--- 133,148 ---- 69 Otherwise, `optind' communicates from one call to the next 70 how much of ARGV has been scanned so far. */ 71 72! extern DLL_VARIABLE int optind; 73 74 /* Callers store zero here to inhibit the error message `getopt' prints 75 for unrecognized options. */ 76 77! extern DLL_VARIABLE int opterr; 78 79 /* Set to an option character which was unrecognized. */ 80 81! extern DLL_VARIABLE int optopt; 82 83 #ifndef __need_getopt 84 /* Describe the long-named options requested by the application. 85