cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

work around namespace pollution from <machine/param.h> on powerpc

Browse Source
This commit is contained in:
naddy 2004-06-24 06:21:50 +00:00
parent 626387c3de
commit 393c8c0b55
4 changed files with 93 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
education/drgeo/patches/patch-geo_define_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-geo_define_h,v 1.1 2004/06/24 06:21:50 naddy Exp $
--- geo/define.h.orig 2004-06-23 23:56:23.000000000 -0600
+++ geo/define.h 2004-06-23 23:56:35.000000000 -0600
@@ -187,7 +187,7 @@ enum angleType
enum numericType
{
- SEGMENT_LENGTH = 1,
+ SEGMENT_LEN = 1,
VECTOR_NORM = 2,
DISTANCE_2PTS = 4,
DISTANCE_PT_CIRCLE = 8,

12
education/drgeo/patches/patch-geo_drgeo_buildObject_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-geo_drgeo_buildObject_cc,v 1.1 2004/06/24 06:21:50 naddy Exp $
--- geo/drgeo_buildObject.cc.orig 2004-06-23 23:57:05.000000000 -0600
+++ geo/drgeo_buildObject.cc 2004-06-23 23:57:21.000000000 -0600
@@ -675,7 +675,7 @@ buildNumeric (int cas, drgeoPoint & at,
{
case 0:
// segment's length
- item = new numeric (at, *selection, (numericType) SEGMENT_LENGTH,
+ item = new numeric (at, *selection, (numericType) SEGMENT_LEN,
FALSE, figure->getFigureList ());
break;
case 1:

57
education/drgeo/patches/patch-geo_drgeo_numeric_cc Normal file
View File

@ -0,0 +1,57 @@
$OpenBSD: patch-geo_drgeo_numeric_cc,v 1.1 2004/06/24 06:21:50 naddy Exp $
--- geo/drgeo_numeric.cc.orig 2004-06-23 23:57:41.000000000 -0600
+++ geo/drgeo_numeric.cc 2004-06-23 23:58:07.000000000 -0600
@@ -45,7 +45,7 @@ value (p, createdFromMacro, figureList)
parents.init_lire ();
switch (type)
{
- case SEGMENT_LENGTH:
+ case SEGMENT_LEN:
/* SEGMENT */
case VECTOR_NORM:
/* VECTOR */
@@ -123,7 +123,7 @@ value (tree, figureList)
{
category = NUMERIC;
if (!strcmp (attr, "segment_length"))
- type = SEGMENT_LENGTH;
+ type = SEGMENT_LEN;
else if (!strcmp (attr, "vector_norm"))
type = VECTOR_NORM;
else if (!strcmp (attr, "distance_2pts"))
@@ -181,7 +181,7 @@ numeric::update (drgeoDrawable & area)
return;
switch (type)
{
- case SEGMENT_LENGTH:
+ case SEGMENT_LEN:
case VECTOR_NORM:
setValue (((direction *) getFirst)->getDirection ().norm ());
break;
@@ -270,7 +270,7 @@ numeric::initName ()
switch (type)
{
case ARC_CIRCLE_LENGTH:
- case SEGMENT_LENGTH:
+ case SEGMENT_LEN:
item0 = (geometricObject *) getFirst;
l += strlen (_("%1's length"));
if (item0->getName ()? strlen (item0->getName ()) : 0)
@@ -381,7 +381,7 @@ numeric::save (xmlNodePtr tree, liste_el
item = xmlNewChild (tree, NULL, BAD_CAST "numeric", NULL);
switch (type)
{
- case SEGMENT_LENGTH:
+ case SEGMENT_LEN:
save_attribute (item, this, "segment_length");
break;
case VECTOR_NORM:
@@ -450,7 +450,7 @@ numeric::updateDescription ()
description = new gchar *[1];
description[0] = g_strdup_printf (_("Free value:: %s"), name);
break;
- case SEGMENT_LENGTH:
+ case SEGMENT_LEN:
description = new gchar *[2];
description[0] = g_strdup_printf (_("Segment's length:: %s"), name);
description[1] = g_strdup_printf (_("Segment %s"), getNthName (0));

12
education/drgeo/patches/patch-geo_drgeo_scm_interface_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-geo_drgeo_scm_interface_cc,v 1.1 2004/06/24 06:21:50 naddy Exp $
--- geo/drgeo_scm_interface.cc.orig 2004-06-23 23:58:28.000000000 -0600
+++ geo/drgeo_scm_interface.cc 2004-06-23 23:58:40.000000000 -0600
@@ -590,7 +590,7 @@ ScmInterface::make_segmentLength (SCM na
parents->ajoute ((void *) gh_scm2ulong (s));
item = (geometricObject *) new numeric (scmCoord2drgeoPoint (x, y), *parents,
- (numericType) SEGMENT_LENGTH, false,
+ (numericType) SEGMENT_LEN, false,
figure->getFigureList ());
setObjectName (name, item);
figure->addToFigureListNoRedraw (item, TRUE);