equal
deleted
inserted
replaced
320 } |
320 } |
321 #endif /* !HEADLESS */ |
321 #endif /* !HEADLESS */ |
322 |
322 |
323 |
323 |
324 #ifndef HEADLESS |
324 #ifndef HEADLESS |
325 static char **getX11FontPath () |
325 static char **getX11FontPath (void) |
326 { |
326 { |
327 char **x11Path, **fontdirs; |
327 char **x11Path, **fontdirs; |
328 int i, pos, slen, nPaths, numDirs; |
328 int i, pos, slen, nPaths, numDirs; |
329 |
329 |
330 x11Path = XGetFontPath (awt_display, &nPaths); |
330 x11Path = XGetFontPath (awt_display, &nPaths); |
579 #include <dlfcn.h> |
579 #include <dlfcn.h> |
580 |
580 |
581 #include <fontconfig/fontconfig.h> |
581 #include <fontconfig/fontconfig.h> |
582 |
582 |
583 |
583 |
584 static void* openFontConfig() { |
584 static void* openFontConfig(void) { |
585 |
585 |
586 char *homeEnv; |
586 char *homeEnv; |
587 static char *homeEnvStr = "HOME="; /* must be static */ |
587 static char *homeEnvStr = "HOME="; /* must be static */ |
588 void* libfontconfig = NULL; |
588 void* libfontconfig = NULL; |
589 #ifdef __solaris__ |
589 #ifdef __solaris__ |
739 |
739 |
740 typedef FcStrList* (*FcConfigGetCacheDirsFuncType)(FcConfig *config); |
740 typedef FcStrList* (*FcConfigGetCacheDirsFuncType)(FcConfig *config); |
741 typedef FcChar8* (*FcStrListNextFuncType)(FcStrList *list); |
741 typedef FcChar8* (*FcStrListNextFuncType)(FcStrList *list); |
742 typedef FcChar8* (*FcStrListDoneFuncType)(FcStrList *list); |
742 typedef FcChar8* (*FcStrListDoneFuncType)(FcStrList *list); |
743 |
743 |
744 static char **getFontConfigLocations() { |
744 static char **getFontConfigLocations(void) { |
745 |
745 |
746 char **fontdirs; |
746 char **fontdirs; |
747 int numdirs = 0; |
747 int numdirs = 0; |
748 FcInitLoadConfigFuncType FcInitLoadConfig; |
748 FcInitLoadConfigFuncType FcInitLoadConfig; |
749 FcPatternBuildFuncType FcPatternBuild; |
749 FcPatternBuildFuncType FcPatternBuild; |