Zap botched merge.
This commit is contained in:
parent
b51c76031a
commit
37febd2b53
|
@ -70,7 +70,6 @@
|
||||||
* valops.c (value_cast): When casting a pointer to an integer,
|
* valops.c (value_cast): When casting a pointer to an integer,
|
||||||
don't convert it to an address.
|
don't convert it to an address.
|
||||||
|
|
||||||
>>>>>>> 1.1438
|
|
||||||
2001-07-10 Andrew Cagney <ac131313@redhat.com>
|
2001-07-10 Andrew Cagney <ac131313@redhat.com>
|
||||||
|
|
||||||
* remote-utils.h (struct serial): Declare as opaque. Remove
|
* remote-utils.h (struct serial): Declare as opaque. Remove
|
||||||
|
|
Loading…
Reference in New Issue