Attachment #71427 for bug #104054

View | Details | Raw Unified | Return to bug 104054
Collapse All | Expand All

Lines 32-38 Link Here

(-)/home/trasz/xevil/Makefile (-1 / +1 lines)
32	@${MKDIR} ${WRKDIR}/${DISTNAME}	32	@${MKDIR} ${WRKDIR}/${DISTNAME}
33		33
34	do-extract:	34	do-extract:
35	@unzip -aqo ${DISTDIR}/${DISTFILES} -d ${WRKSRC}	35	@${UNZIP_CMD} -aqo ${DISTDIR}/${DISTFILES} -d ${WRKSRC}
36		36
37	do-install:	37	do-install:
38	${INSTALL_PROGRAM} ${WRKSRC}/x11/FREEBSD/xevil ${PREFIX}/bin/xevil	38	${INSTALL_PROGRAM} ${WRKSRC}/x11/FREEBSD/xevil ${PREFIX}/bin/xevil




--- cmn/locator.h.orig	Sat Mar 22 20:35:30 2003
+++ cmn/locator.h	Fri Oct  6 13:44:36 2006
@@ -47,7 +47,8 @@
 
 

 
 #include "utils.h"
 #include "coord.h"
@@ -108,12 +109,12 @@
 
   
   // Only valid if mapped || flash.
-  OLgridEntry *gridEntry; 
+  class OLgridEntry *gridEntry; 
   // Set by OLgridEntry::insert.  Not nec. valid.
   GLoc gloc; 
 #if X11
   // Only valid if mapped || flash.
-  OLshadowEntry *shadowEntry; 
+  class OLshadowEntry *shadowEntry; 
   // Set by OLshadowEntry::insert.  Not nec. valid.
   GLoc shadowGloc; 
 #endif




--- cmn/utils.cpp.orig	Wed Mar 19 10:05:12 2003
+++ cmn/utils.cpp	Fri Oct  6 13:45:47 2006
@@ -30,16 +30,17 @@
 
 // Include Files

 #endif
 
 #ifdef WIN32
@@ -761,7 +762,7 @@
 
 
 private:
-  Bucket* HashTable::_get(int &index,void* key);
+  Bucket* _get(int &index,void* key);
   /* MODIFIES: index */
   /* EFFECTS: Internal helper function.  Return the Bucket containing key
      or NULL if not found.  Set index to the bucket list for key whether

Return to bug 104054

Lines 1-5 Link Here

(-)/home/trasz/xevil/files/patch-cmn::locator.h (-2 / +17 lines)
1	--- cmn/locator.h.dist Sat Mar 22 20:35:30 2003	1	--- cmn/locator.h.orig Sat Mar 22 20:35:30 2003
2	+++ cmn/locator.h Sat Oct 25 21:42:46 2003	2	+++ cmn/locator.h Fri Oct 6 13:44:36 2006
3	@@ -47,7 +47,8 @@	3	@@ -47,7 +47,8 @@
4		4
5		5
Lines 10-12 Link Here
10		10
11	#include "utils.h"	11	#include "utils.h"
12	#include "coord.h"	12	#include "coord.h"
		13	@@ -108,12 +109,12 @@
		14
		15
		16	// Only valid if mapped \|\| flash.
		17	- OLgridEntry *gridEntry;
		18	+ class OLgridEntry *gridEntry;
		19	// Set by OLgridEntry::insert. Not nec. valid.
		20	GLoc gloc;
		21	#if X11
		22	// Only valid if mapped \|\| flash.
		23	- OLshadowEntry *shadowEntry;
		24	+ class OLshadowEntry *shadowEntry;
		25	// Set by OLshadowEntry::insert. Not nec. valid.
		26	GLoc shadowGloc;
		27	#endif

Lines 1-5 Link Here

(-)/home/trasz/xevil/files/patch-cmn::utils.cpp (-1 / +10 lines)
1	--- cmn/utils.cpp.orig Wed Mar 19 10:05:12 2003	1	--- cmn/utils.cpp.orig Wed Mar 19 10:05:12 2003
2	+++ cmn/utils.cpp Sat Oct 25 21:45:15 2003	2	+++ cmn/utils.cpp Fri Oct 6 13:45:47 2006
3	@@ -30,16 +30,17 @@	3	@@ -30,16 +30,17 @@
4		4
5	// Include Files	5	// Include Files
Lines 24-26 Link Here
24	#endif	24	#endif
25		25
26	#ifdef WIN32	26	#ifdef WIN32
		27	@@ -761,7 +762,7 @@
		28
		29
		30	private:
		31	- Bucket* HashTable::_get(int &index,void* key);
		32	+ Bucket* _get(int &index,void* key);
		33	/* MODIFIES: index */
		34	/* EFFECTS: Internal helper function. Return the Bucket containing key
		35	or NULL if not found. Set index to the bucket list for key whether