Petteri Räty kirjoitti: > Phil Race kirjoitti: >> Some of those are .c files, not header files. >> You may also want to see how any of these files differ in any significant >> way from the ones on your system. I think at least a couple of them are >> modified. >> >> -phil >> > > Yep I never talked about headers exclusively. My point mainly being that > keeping forked files should be avoided if at all possible. Any > improvements/changes should go upstream etc. Yes diffing them is > certainly prudent but let's see if I find the time for that any time soon. > > Regards, > Petteri >
Ok so mapping these files:
Xrandr.h
x11-libs/libXrandr
Xinerama.c
x11-libs/libXinerama
panoramiXext.h
panoramiXproto.h
Xinerama.h
x11-proto/xineramaproto
randr.h
x11-proto/randrproto
extutil.h
x11-proto/xextproto
multiVis.c
multiVis.h
list.c
list.h
wsutils.h
x11-apps/xwd
Of these the files in xwd can't be currently linked against as xwd is an
application. The other should be fine to use the system files based on
the diffs at least on Linux. Take for example the attached
panoramiXproto.h diff.
--- panoramiXproto.h 2007-06-21 10:48:01.000000000 +0300 +++ /usr/include/X11/extensions/panoramiXproto.h 2006-12-18 22:45:36.000000000 +0200 @@ -1,34 +1,5 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this - * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. - */ - /* $Xorg: panoramiXproto.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */ /***************************************************************** - * This file is available under and governed by the GNU General Public - * License version 2 only, as published by the Free Software Foundation. - * However, the following notice accompanied the original version of this - * file: - Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -52,9 +23,7 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ - -#ifdef __linux__ +/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ @@ -221,5 +190,3 @@ #define sz_XineramaScreenInfo 8 #endif - -#endif /* __linux__ */
signature.asc
Description: OpenPGP digital signature
