diff options
| author | Nathan Keynes <Nathan.Keynes@Sun.COM> | 2009-04-30 16:35:44 -0700 |
|---|---|---|
| committer | Nathan Keynes <Nathan.Keynes@Sun.COM> | 2009-04-30 16:35:44 -0700 |
| commit | 8883f1c270cc8e33c18dd088e744840092b47bbb (patch) | |
| tree | 8158374df4c6ad96b23aae3de2c235943f3dcc7a /usr/src/cmd/mailx | |
| parent | 2d2627043e43d2539979aab3fb55dafd776970e6 (diff) | |
| download | illumos-joyent-8883f1c270cc8e33c18dd088e744840092b47bbb.tar.gz | |
6795209 Enable compilation of ON-consolidation with GCC 4.2
6392640 rpcgen -h -T output does not compile with gcc 4.x
Diffstat (limited to 'usr/src/cmd/mailx')
| -rw-r--r-- | usr/src/cmd/mailx/hdr/glob.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr/src/cmd/mailx/hdr/glob.h b/usr/src/cmd/mailx/hdr/glob.h index 01dcf5b317..d46fc5a3f3 100644 --- a/usr/src/cmd/mailx/hdr/glob.h +++ b/usr/src/cmd/mailx/hdr/glob.h @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -22,10 +21,9 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ /* @@ -38,7 +36,8 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" +#ifndef _HDR_GLOB_H +#define _HDR_GLOB_H /* * mailx -- a modified version of a University of California at Berkeley @@ -69,7 +68,6 @@ extern char *editfile; /* Name of file being edited */ extern int exitflg; /* -e for mail test */ extern NODE *fplist; /* ???? */ extern struct grouphead *groups[]; /* Pointer to active groups */ -extern struct hdr header[]; /* Known header types */ extern int hflag; /* Sequence number for network -h */ extern char homedir[]; /* Name of home directory */ extern char host[]; /* ???? */ @@ -82,7 +80,7 @@ extern FILE *itf; /* Input temp file buffer */ extern int lexnumber; /* Number of TNUMBER from scan() */ extern char lexstring[]; /* String from TSTRING, scan() */ extern int loading; /* Loading user definitions */ -extern char *lockname; /* named used for locking in /var/mail */ +extern char *lockname; /* named used for /var/mail locking */ extern char *maildir; /* directory for mail files */ extern char mailname[]; /* Name of /var/mail system mailbox */ extern off_t mailsize; /* Size of system mailbox */ @@ -112,7 +110,7 @@ extern int rcvmode; /* True if receiving mail */ extern int readonly; /* Will be unable to rewrite file */ extern int regretp; /* Pointer to TOS of regret tokens */ extern int regretstack[]; /* Stack of regretted tokens */ -extern struct ignore *retain[HSHSIZE];/* Pointer to retained fields */ +extern struct ignore *retain[HSHSIZE]; /* Pointer to retained fields */ extern char *rflag; /* -r address for network */ extern int rmail; /* Being called as rmail */ extern int sawcom; /* Set after first command */ @@ -143,3 +141,5 @@ extern int receipt_flg; /* Flag for return receipt */ */ extern char *optarg; extern int optind; + +#endif /* _HDR_GLOB_H */ |