mirror of
https://github.com/RTimothyEdwards/magic.git
synced 2026-08-22 14:17:43 +02:00
geometry.h: constify global wellknown Geometry data values
This then rippled through into callers Fixed merge conflicts in cif/CIFrdutils.c and cif/CIFread.h
This commit is contained in:
committed by
Tim Edwards
parent
a224c7e21a
commit
aa43cc164e
+2
-1
@@ -1302,7 +1302,8 @@ DefReadLocation(use, f, oscale, tptr, noplace)
|
||||
Transform *tptr;
|
||||
bool noplace;
|
||||
{
|
||||
Rect *r, tr, rect;
|
||||
const Rect *r;
|
||||
Rect tr, rect;
|
||||
int keyword;
|
||||
char *token;
|
||||
float x, y;
|
||||
|
||||
+4
-3
@@ -722,7 +722,7 @@ LefReadLayers(f, obstruct, lreturn, rreturn)
|
||||
FILE *f;
|
||||
bool obstruct;
|
||||
TileType *lreturn;
|
||||
Rect **rreturn;
|
||||
const Rect **rreturn;
|
||||
{
|
||||
char *token;
|
||||
TileType curlayer = -1;
|
||||
@@ -810,7 +810,7 @@ LefReadLayer(f, obstruct)
|
||||
FILE *f;
|
||||
bool obstruct;
|
||||
{
|
||||
return LefReadLayers(f, obstruct, (TileType *)NULL, (Rect **)NULL);
|
||||
return LefReadLayers(f, obstruct, (TileType *)NULL, (const Rect **)NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1200,7 +1200,8 @@ LefReadGeometry(lefMacro, f, oscale, do_list, is_imported)
|
||||
LinkedRect *newRect, *rectList;
|
||||
Point *pointList;
|
||||
int points;
|
||||
Rect *paintrect, *contact = NULL;
|
||||
Rect *paintrect;
|
||||
const Rect *contact = NULL;
|
||||
|
||||
static char *geometry_keys[] = {
|
||||
"LAYER",
|
||||
|
||||
Reference in New Issue
Block a user