Author: branden
Date: 2005-06-05 18:22:32 -0500 (Sun, 05 Jun 2005)
New Revision: 142
Modified:
trunk/xc/config/cf/linux.cf
trunk/xc/extras/Xpm/lib/create.c
trunk/xc/extras/Xpm/lib/scan.c
Log:
Revert patches applied to trunk's copy of the vendor branch.
Ultimately, trunk/xc will all patches from trunk/debian/patches applied to
it. However, that's going to wait until we change build/patch systems.
Reverting trunk/xc to be a pristine copy of the vendor branch (as of the
freedesktop.org XORG-6_8_2 CVS tag when originally created) enables us to
keep using dbs for the time being.
Modified: trunk/xc/config/cf/linux.cf
===================================================================
--- trunk/xc/config/cf/linux.cf 2005-06-05 22:54:23 UTC (rev 141)
+++ trunk/xc/config/cf/linux.cf 2005-06-05 23:22:32 UTC (rev 142)
@@ -95,13 +95,13 @@
XCOMM binutils: (LinuxBinUtilsMajorVersion)
#if LinuxDistribution == LinuxDebian
-# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
+# if !NothingOutsideProjectRoot
# define SystemManDirectory /usr/share/man
# endif
# define HasPam YES
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
-# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
+# if !NothingOutsideProjectRoot
# define XAppLoadDir EtcX11Directory/app-defaults
# define XFileSearchPathDefault
Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
/* the relative symlink created by this rule causes problems for us */
@@ -112,7 +112,7 @@
# define InstallAppDefaultsLong(file,class) @@\
InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
# endif /* InstallAppDefFiles */
-# endif /* !defined(NotingOutsideProjectRoot) || !NothingOutsideProjectRoot */
+# endif /* !NothingOutsideProjectRoot */
# define SharedLibXdmGreet NO
# define LinkGLToUsrInclude NO
# define LinkGLToUsrLib NO
Modified: trunk/xc/extras/Xpm/lib/create.c
===================================================================
--- trunk/xc/extras/Xpm/lib/create.c 2005-06-05 22:54:23 UTC (rev 141)
+++ trunk/xc/extras/Xpm/lib/create.c 2005-06-05 23:22:32 UTC (rev 142)
@@ -1215,10 +1215,10 @@
register char *src;
register char *dst;
register unsigned int *iptr;
- register unsigned int x, y;
+ register unsigned int x, y, i;
register char *data;
Pixel pixel, px;
- int nbytes, depth, ibu, ibpp, i;
+ int nbytes, depth, ibu, ibpp;
data = image->data;
iptr = pixelindex;
Modified: trunk/xc/extras/Xpm/lib/scan.c
===================================================================
--- trunk/xc/extras/Xpm/lib/scan.c 2005-06-05 22:54:23 UTC (rev 141)
+++ trunk/xc/extras/Xpm/lib/scan.c 2005-06-05 23:22:32 UTC (rev 142)
@@ -621,8 +621,8 @@
char *dst;
unsigned int *iptr;
char *data;
- unsigned int x, y;
- int bits, depth, ibu, ibpp, offset, i;
+ unsigned int x, y, i;
+ int bits, depth, ibu, ibpp, offset;
unsigned long lbt;
Pixel pixel, px;
@@ -633,9 +633,6 @@
ibpp = image->bits_per_pixel;
offset = image->xoffset;
- if (image->bitmap_unit < 0)
- return (XpmNoMemory);
-
if ((image->bits_per_pixel | image->depth) == 1) {
ibu = image->bitmap_unit;
for (y = 0; y < height; y++)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
