Browse Source

* changed library handle types to the correct TLibHandle
* avoid call of FreeLibrary() with zero, because it crashes on some linux versions

git-svn-id: trunk@2748 -

tom_at_work 19 years ago
parent
commit
7f192e369e
3 changed files with 9 additions and 6 deletions
  1. 3 2
      packages/extra/opengl/gl.pp
  2. 3 2
      packages/extra/opengl/glu.pp
  3. 3 2
      packages/extra/opengl/glut.pp

+ 3 - 2
packages/extra/opengl/gl.pp

@@ -74,7 +74,7 @@ uses
 
 
 {$IFNDEF MORPHOS}
 {$IFNDEF MORPHOS}
 var
 var
-  LibGL: THandle;
+  LibGL: TLibHandle;
 {$ENDIF MORPHOS}
 {$ENDIF MORPHOS}
 
 
 type
 type
@@ -1917,7 +1917,8 @@ begin
   @ChoosePixelFormat := nil;
   @ChoosePixelFormat := nil;
   {$ENDIF}
   {$ENDIF}
 
 
-  FreeLibrary(LibGL);
+  if (LibGL <> 0) then
+    FreeLibrary(LibGL);
 {$ENDIF MORPHOS}
 {$ENDIF MORPHOS}
 end;
 end;
 
 

+ 3 - 2
packages/extra/opengl/glu.pp

@@ -394,7 +394,7 @@ implementation
 {$ELSE MORPHOS}
 {$ELSE MORPHOS}
 
 
 var
 var
-  hDLL: THandle;
+  hDLL: TLibHandle;
 
 
 {$ENDIF MORPHOS}
 {$ENDIF MORPHOS}
 
 
@@ -456,7 +456,8 @@ begin
   @gluNextContour := nil;
   @gluNextContour := nil;
   @gluEndPolygon := nil;
   @gluEndPolygon := nil;
 
 
-  FreeLibrary(hDLL);
+  if (hDLL <> 0) then
+    FreeLibrary(hDLL);
 {$ENDIF MORPHOS}
 {$ENDIF MORPHOS}
 end;
 end;
 
 

+ 3 - 2
packages/extra/opengl/glut.pp

@@ -470,7 +470,7 @@ implementation
 
 
 {$ELSE MORPHOS}
 {$ELSE MORPHOS}
 var
 var
-  hDLL: THandle;
+  hDLL: TLibHandle;
 {$ENDIF MORPHOS}
 {$ENDIF MORPHOS}
 
 
 procedure FreeGlut;
 procedure FreeGlut;
@@ -479,7 +479,8 @@ begin
   // MorphOS's GL will closed down by TinyGL unit, nothing is needed here.
   // MorphOS's GL will closed down by TinyGL unit, nothing is needed here.
 {$ELSE MORPHOS}
 {$ELSE MORPHOS}
 
 
-  FreeLibrary(hDLL);
+  if (hDLL <> 0) then
+    FreeLibrary(hDLL);
 
 
   @glutInit := nil;
   @glutInit := nil;
   @glutInitDisplayMode := nil;
   @glutInitDisplayMode := nil;