comparison src/device-x.c @ 4982:3c3c1d139863

Automatic merge
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 11:25:00 -0600
parents 4aebb0131297 16112448d484
children 9410323e4b0d 6f2158fa75ed b5df3737028a
comparison
equal deleted inserted replaced
4981:4aebb0131297 4982:3c3c1d139863
740 740
741 no_data_directory: 741 no_data_directory:
742 { 742 {
743 /* Cast off const for G++ 4.3. */ 743 /* Cast off const for G++ 4.3. */
744 Extbyte *temp = (Extbyte *) locale; 744 Extbyte *temp = (Extbyte *) locale;
745 xfree (temp, Extbyte*); 745 xfree (temp);
746 } 746 }
747 } 747 }
748 #endif /* MULE */ 748 #endif /* MULE */
749 749
750 if (NILP (DEVICE_NAME (d))) 750 if (NILP (DEVICE_NAME (d)))
948 948
949 #ifndef NEW_GC 949 #ifndef NEW_GC
950 static void 950 static void
951 free_x_device_struct (struct device *d) 951 free_x_device_struct (struct device *d)
952 { 952 {
953 xfree (d->device_data, void *); 953 xfree (d->device_data);
954 } 954 }
955 #endif /* not NEW_GC */ 955 #endif /* not NEW_GC */
956 956
957 static void 957 static void
958 x_delete_device (struct device *d) 958 x_delete_device (struct device *d)