FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1023 from ankurverma85/master

Browse Source 
Fix Duplicate symbols when linking OSG as a static library
This commit is contained in:
Robert Osfield 2021-01-18 14:07:21 +00:00 committed by GitHub
commit 657842d60b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgPlugins/zip/unzip.cpp
View File

@ -269,7 +269,7 @@ FILETIME dosdatetime2filetime(WORD dosdate,WORD dostime)
return ft; return ft;
} }
bool FileExists(const TCHAR *fn) static bool FileExists(const TCHAR *fn)
{ return (GetFileAttributes(fn)!=0xFFFFFFFF); { return (GetFileAttributes(fn)!=0xFFFFFFFF);
} }
#endif #endif
@ -1741,9 +1741,9 @@ int inflate_blocks_free(inflate_blocks_statef *s, z_streamp z)
// //
// This symbol conflicts with other dependencies when OSG is used in static-lib mode
extern const char inflate_copyright[] = // extern const char inflate_copyright[] =
" inflate 1.1.3 Copyright 1995-1998 Mark Adler "; // " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
// If you use the zlib library in a product, an acknowledgment is welcome // If you use the zlib library in a product, an acknowledgment is welcome
// in the documentation of your product. If for some reason you cannot // in the documentation of your product. If for some reason you cannot
// include such an acknowledgment, I would appreciate that you keep this // include such an acknowledgment, I would appreciate that you keep this