[Bug-gnulib] getopt.h && __GNUC_PREREQ

[Karl Berry]

I received this bug report regarding a pretest of Texinfo:

    Date: Mon, 15 Mar 2004 08:51:14 -0500
    From: Vin Shelton <address@hidden>

    On a SunOS-5.8 system, I cannot configure and build version 4.6.91
    specifying --disable-nls.  Here is the output of 'make':
    [...]
    In file included from ../../../src/texinfo-4.6.91/lib/getopt.c:98:
    ../../../src/texinfo-4.6.91/lib/getopt.h:41:43: missing binary operator 
before token "("
    make[2]: *** [getopt.o] Error 1

This is the current getopt.h from gnulib.

This happens for me as well, on SunOS 5.8 with gcc 3.2.3 (I don't have a
Solaris system with the current gcc to try that).  Oddly, it does not
happen with 3.2.3 under Debian.

In any case, looking at getopt.h, I'd like to suggest the following
change (which fixes it).  Ok?  Can this get back into libc?

*** getopt.h.~1.2.~     Thu Mar 11 05:05:48 2004
--- getopt.h    Thu Mar 18 14:28:55 2004
***************
*** 35,41 ****
  #endif
  
  #ifndef __THROW
! # ifndef __GNUC__
  #  define __GNUC_PREREQ(maj, min) (0)
  # endif
  # if defined __cplusplus && __GNUC_PREREQ (2,8)
--- 35,41 ----
  #endif
  
  #ifndef __THROW
! # ifndef __GNUC_PREREQ
  #  define __GNUC_PREREQ(maj, min) (0)
  # endif
  # if defined __cplusplus && __GNUC_PREREQ (2,8)