diff options
| author | Paul Eggert <eggert@twinsun.com> | 1999-10-19 07:17:20 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@twinsun.com> | 1999-10-19 07:17:20 +0000 |
| commit | 4ee9629e2beb7a870ab30509d547b6845ef645cf (patch) | |
| tree | ba84e985b8ba9da225ebba7cb9f3326556b335a4 /lib-src/getopt1.c | |
| parent | 09ed9b3cac4585c1bcaf32c7aefd43e8112a4de7 (diff) | |
Add support for large files. Merge glibc 2.1.2.
* b2m.c, emacsclient.c, emacsserver.c, fakemail.c, make-docfile.c,
movemail.c, pop.c:
Do not include <stdlib.h>, as <config.h> does this now.
* b2m.c, emacsserver.c, etags.c, profile.c:
Include <config.h> before any system include files.
* emacsclient.c, emacsserver.c, fakemail.c, movemail.c, pop.c,
test-distrib.c:
(read, write, open, close): Do not undef.
* getopt.c, getopt1.c: Adopt glibc 2.1.2, with the following fix:
(const): Do not define if HAVE_CONFIG_H; that's config.h's job.
* getopt.h: Adopt glibc 2.1.2.
Diffstat (limited to 'lib-src/getopt1.c')
| -rw-r--r-- | lib-src/getopt1.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c index ff257374c3..9c8256567c 100644 --- a/lib-src/getopt1.c +++ b/lib-src/getopt1.c @@ -1,7 +1,6 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98 Free Software Foundation, Inc. - NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@gnu.org. @@ -16,16 +15,12 @@ GNU General Public License for more details. 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. */ + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include <config.h> -#endif - -#include "getopt.h" - +#else #if !defined __STDC__ || !__STDC__ /* This is a separate conditional since some stdc systems reject `defined (const)'. */ @@ -33,6 +28,9 @@ #define const #endif #endif +#endif + +#include "getopt.h" #include <stdio.h> |