diff --git a/SConstruct b/SConstruct index 289ed0050..373348fc1 100644 --- a/SConstruct +++ b/SConstruct @@ -841,7 +841,7 @@ class DXXProgram(DXXCommon): 'editor/meddraw.cpp', 'editor/medmisc.cpp', 'editor/medrobot.cpp', -'editor/medsel.c', +'editor/medsel.cpp', 'editor/medwall.c', 'editor/mine.c', 'editor/objpage.c', diff --git a/similar/editor/medsel.c b/similar/editor/medsel.cpp similarity index 97% rename from similar/editor/medsel.c rename to similar/editor/medsel.cpp index 37cb3fd49..a4543e83d 100644 --- a/similar/editor/medsel.c +++ b/similar/editor/medsel.cpp @@ -32,6 +32,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor/medmisc.h" #include "segment.h" #include "object.h" +#include "medsel.h" +#include "kdefs.h" typedef struct sort_element { short segnum; @@ -65,7 +67,7 @@ void sort_seg_list(int n_segs,short *segnumlist,vms_vector *pos) int i; sort_element *sortlist; - sortlist = d_calloc(n_segs, sizeof(*sortlist)); + CALLOC(sortlist, sort_element, n_segs); for (i=0;i