X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetopt_.h;h=a4e78cb06bfe4fe0584828be3defa69c88555514;hb=7ec881d86b09cad88b3999ee314c21abe78c7eb2;hp=83ac8b12844b8d9e4d7d0170c080e8ea4ddc40a1;hpb=df81465613d8cda39a02d16aa62c0db476349fac;p=gnulib.git diff --git a/lib/getopt_.h b/lib/getopt_.h index 83ac8b128..a4e78cb06 100644 --- a/lib/getopt_.h +++ b/lib/getopt_.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _GETOPT_H @@ -67,14 +67,14 @@ but it caused redefinition warnings if both unistd.h and getopt.h were included, since unistd.h includes getopt.h having previously defined __need_getopt. - + The only place where __getopt_argv_const is used is in definitions of getopt_long and getopt_long_only below, but these are visible only if __need_getopt is not defined, so it is quite safe to rewrite the conditional as follows: */ #if !defined __need_getopt -# if defined __GETOPT_PREFIX +# if defined __GETOPT_PREFIX # define __getopt_argv_const /* empty */ # else # define __getopt_argv_const const