Prechádzať zdrojové kódy

rename geticonfilename to avoid link conflict

cxgeorge 25 rokov pred
rodič
commit
4249c71788

+ 1 - 1
panda/src/wgldisplay/config_wgldisplay.cxx

@@ -43,7 +43,7 @@ init_libwgldisplay() {
 }
 
 // cant use global var cleanly because global var static init executed after init_libwgl(), incorrectly reiniting var
-Filename get_icon_filename() {
+Filename get_icon_filename_() {
   string iconname = config_wgldisplay.GetString("win32-window-icon","");
   return ExecutionEnvironment::expand_string(iconname);
 }

+ 1 - 1
panda/src/wgldisplay/config_wgldisplay.h

@@ -12,7 +12,7 @@
 
 NotifyCategoryDecl(wgldisplay, EXPCL_PANDAGL, EXPTP_PANDAGL);
 
-extern Filename get_icon_filename();
+extern Filename get_icon_filename_();
 
 extern EXPCL_PANDAGL void init_libwgldisplay();
 

+ 1 - 1
panda/src/wgldisplay/wglGraphicsPipe.cxx

@@ -38,7 +38,7 @@ wglGraphicsPipe::wglGraphicsPipe(const PipeSpecifier& spec)
   wc.lpszMenuName	= NULL;
   wc.lpszClassName	= "wglStandard";
 
-  string windows_icon_filename = get_icon_filename().to_os_specific();
+  string windows_icon_filename = get_icon_filename_().to_os_specific();
 
   if(!windows_icon_filename.empty()) {
     // Note: LoadImage seems to cause win2k internal heap corruption (outputdbgstr warnings)