Path: blob/main/cad/electric/files/patch-src_graph_graphunixx11.c
18157 views
--- src/graph/graphunixx11.c.orig 2004-07-16 01:59:53 UTC1+++ src/graph/graphunixx11.c2@@ -167,6 +167,8 @@3#define TRUESTRLEN strlen456+#include <sys/sysctl.h>7+8/****** windows ******/910#define WMLEFTBORDER 8 /* size of left border for windows */11@@ -1518,13 +1520,13 @@ BOOLEAN initgraphics(BOOLEAN messages)12gra_truetypeon = 1;1314/* Preload T1 fonts here, because T1_LoadFont spoils memory */15- for(j=0; j<T1_Get_no_fonts(); j++) T1_LoadFont(j);16+ for(j=0; j<T1_GetNoFonts(); j++) T1_LoadFont(j);1718gra_truetypedeffont = 0; /* presume that the first font is good to use */19ptr = egetenv(x_("ELECTRIC_TRUETYPE_FONT"));20if (ptr != NULL)21{22- j = T1_Get_no_fonts();23+ j = T1_GetNoFonts();24for(gra_truetypedeffont=0; gra_truetypedeffont<j; gra_truetypedeffont++)25{26T1_LoadFont(gra_truetypedeffont);27@@ -3088,8 +3090,13 @@ void ewait(INTBIG process)28INTBIG enumprocessors(void)29{30INTBIG numproc;31+ size_t proclen;32+33+ proclen = sizeof(numproc);34+ if ((sysctlbyname("hw.ncpu", &numproc, &proclen, NULL, 0) < 0) ||35+ (proclen != sizeof(numproc)))36+ numproc = 1;3738- numproc = sysconf(_SC_NPROCESSORS_ONLN);39return(numproc);40}4142@@ -4758,7 +4765,7 @@ INTBIG screengetfacelist(CHAR ***list, B4344if (gra_numfaces == 0)45{46- total = T1_Get_no_fonts();47+ total = T1_GetNoFonts();48gra_numfaces = total + 1;49gra_facelist = (CHAR **)emalloc(gra_numfaces * (sizeof (CHAR *)), us_tool->cluster);50if (gra_facelist == 0) return(0);515253