diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-08-02 14:27:03 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-08-02 14:27:03 -0400 |
| commit | e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74 (patch) | |
| tree | c9639b11acb0ff6c90d774574b0392d81320e84e /Xext | |
| parent | 32c0dcc8c0d1edba5d7e418fd2dc916847a4f069 (diff) | |
| parent | f3955c0a020b39021050cd33c20a17f14fc4b579 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/devices.c
dix/property.c
include/dix.h
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/fontcache.c | 2 | ||||
| -rw-r--r-- | Xext/panoramiX.h | 1 | ||||
| -rw-r--r-- | Xext/sampleEVI.c | 1 | ||||
| -rw-r--r-- | Xext/security.c | 8 | ||||
| -rw-r--r-- | Xext/shmint.h | 2 | ||||
| -rw-r--r-- | Xext/xcalibrate.c | 2 | ||||
| -rw-r--r-- | Xext/xvdisp.h | 2 |
7 files changed, 0 insertions, 18 deletions
diff --git a/Xext/fontcache.c b/Xext/fontcache.c index db0348144..c54340b61 100644 --- a/Xext/fontcache.c +++ b/Xext/fontcache.c @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * Id: fontcache.c,v 1.12 1999/01/31 13:47:45 akiyama Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h index 3ad90fa84..89c754732 100644 --- a/Xext/panoramiX.h +++ b/Xext/panoramiX.h @@ -1,4 +1,3 @@ -/* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c index d9c569609..7508aa773 100644 --- a/Xext/sampleEVI.c +++ b/Xext/sampleEVI.c @@ -20,7 +20,6 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/Xext/security.c b/Xext/security.c index 0d46359ec..b6df61a61 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -1292,11 +1292,7 @@ SecurityFreePropertyAccessList(void) } } /* SecurityFreePropertyAccessList */ -#ifndef __UNIXOS2__ #define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') ) -#else -#define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r') ) -#endif static char * SecuritySkipWhitespace( @@ -1574,11 +1570,7 @@ SecurityLoadPropertyAccessList(void) if (!SecurityPolicyFile) return; -#ifndef __UNIXOS2__ f = fopen(SecurityPolicyFile, "r"); -#else - f = fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r"); -#endif if (!f) { ErrorF("error opening security policy file %s\n", diff --git a/Xext/shmint.h b/Xext/shmint.h index 5135d1729..fc056bc72 100644 --- a/Xext/shmint.h +++ b/Xext/shmint.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/Xext/xcalibrate.c b/Xext/xcalibrate.c index e273c5313..97ef3dc38 100644 --- a/Xext/xcalibrate.c +++ b/Xext/xcalibrate.c @@ -1,6 +1,4 @@ /* - * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $ - * * Copyright © 2003 Philip Blundell * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/Xext/xvdisp.h b/Xext/xvdisp.h index 00af9858b..75cacddcc 100644 --- a/Xext/xvdisp.h +++ b/Xext/xvdisp.h @@ -1,3 +1 @@ -/* $XFree86$ */ - extern void XineramifyXv(void); |