Changeset 58614 in vbox for trunk/src/VBox/Additions/common/crOpenGL

Timestamp:

Nov 9, 2015 11:33:41 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103992

Message:

bugref:8087: Additions/x11: support non-root X server: revert r103927 (when our OpenGL library is loaded directly on Linux ... the constructor needs to be called ...): we do not need a constructor for libGL.so.1, as the entry point is called explicitly in all relevant places. In fact, it was not even set up due to a bad preprocessor conditional.

File:

• trunk/src/VBox/Additions/common/crOpenGL/load.c (modified) (2 diffs)

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -1111 +1111 @@
  */
 bool
-#if defined(LINUX) && !defined(VBOXOGL_FAKEDRI)
-__attribute__ ((constructor))
-#endif 
 stubInit(void)
 {
@@ -1129 +1126 @@
 /* Sigh -- we can't do initialization at load time, since Windows forbids
  * the loading of other libraries from DLLMain. */
-
-#ifdef LINUX
-/** @todo remove this, but only once we are sure it is not needed. */
-/* GCC crap
- *void (*stub_init_ptr)(void) __attribute__((section(".ctors"))) = __stubInit; */
-#endif
 
 #ifdef WINDOWS