* PChar -> PAnsichar

packages/opengl/examples/glutdemo.pp

@@ -108,10 +108,10 @@ begin
 
   WriteLn;
   WriteLn('GL info:');
-  WriteLn('  Vendor: ', PChar(glGetString(GL_VENDOR)));
-  WriteLn('  Renderer: ', PChar(glGetString(GL_RENDERER)));
-  WriteLn('  Version: ', PChar(glGetString(GL_VERSION)));
-  WriteLn('  Extensions: ', PChar(glGetString(GL_EXTENSIONS)));
+  WriteLn('  Vendor: ', PAnsiChar(glGetString(GL_VENDOR)));
+  WriteLn('  Renderer: ', PAnsiChar(glGetString(GL_RENDERER)));
+  WriteLn('  Version: ', PAnsiChar(glGetString(GL_VERSION)));
+  WriteLn('  Extensions: ', PAnsiChar(glGetString(GL_EXTENSIONS)));
 
   // Enable backface culling
   glEnable(GL_CULL_FACE);

packages/opengl/examples/glutdemova.pp

@@ -132,10 +132,10 @@ begin
 
   WriteLn;
   WriteLn('GL info:');
-  WriteLn('  Vendor: ', PChar(glGetString(GL_VENDOR)));
-  WriteLn('  Renderer: ', PChar(glGetString(GL_RENDERER)));
-  WriteLn('  Version: ', PChar(glGetString(GL_VERSION)));
-  WriteLn('  Extensions: ', PChar(glGetString(GL_EXTENSIONS)));
+  WriteLn('  Vendor: ', PAnsiChar(glGetString(GL_VENDOR)));
+  WriteLn('  Renderer: ', PAnsiChar(glGetString(GL_RENDERER)));
+  WriteLn('  Version: ', PAnsiChar(glGetString(GL_VERSION)));
+  WriteLn('  Extensions: ', PAnsiChar(glGetString(GL_EXTENSIONS)));
 
   // Enable backface culling
   glEnable(GL_CULL_FACE);

packages/opengl/examples/glxtest.pp

@@ -90,7 +90,7 @@ end;
 
 var
   window_title_property: TXTextProperty;
-  title: String;
+  title: ansiString;
   FBConfig: TGLXFBConfig;
   FBConfigs: PGLXFBConfig;
   FBConfigsCount: Integer;
@@ -178,4 +178,4 @@ begin
   XMapWindow(dpy,win);
   
   loop();
-end.
+end.

packages/opengl/examples/morph3d.pp

@@ -840,7 +840,7 @@ end;
 
 procedure do_key(k:byte;x,y:integer); cdecl;
 begin
-  case Char(k) of
+  case AnsiChar(k) of
     '1' : _object:=1;
     '2' : _object:=2;
     '3' : _object:=3;

packages/opengl/src/freeglut.pp

@@ -119,8 +119,8 @@ var
   // Font stuff
   glutBitmapHeight: function(font : pointer): Integer; extdecl;
   glutStrokeHeight: function(font : pointer): GLfloat; extdecl;
-  glutBitmapString: procedure(font : pointer; const str: PChar); extdecl;
-  glutStrokeString: procedure(font : pointer; const str: PChar); extdecl;
+  glutBitmapString: procedure(font : pointer; const str: PAnsiChar); extdecl;
+  glutStrokeString: procedure(font : pointer; const str: PAnsiChar); extdecl;
 
   // Geometry functions
   glutWireRhombicDodecahedron: procedure; extdecl;

packages/opengl/src/gl.pp

@@ -1242,7 +1242,7 @@ var
   glGetPixelMapusv: procedure(map: GLenum; values: PGLushort); extdecl;
   glGetPointerv: procedure(pname: GLenum; params: Pointer); extdecl;
   glGetPolygonStipple: procedure(mask: PGLubyte); extdecl;
-  glGetString: function(name: GLenum): PChar; extdecl;
+  glGetString: function(name: GLenum): PAnsiChar; extdecl;
   glGetTexEnvfv: procedure(target, pname: GLenum; params: PGLfloat); extdecl;
   glGetTexEnviv: procedure(target, pname: GLenum; params: PGLint); extdecl;
   glGetTexGendv: procedure(coord, pname: GLenum; params: PGLdouble); extdecl;
@@ -1881,7 +1881,7 @@ end;
 var
   MethodName: string = '';
 
-  function GetGLProcAddress(Lib: PtrInt; ProcName: PChar): Pointer;
+  function GetGLProcAddress(Lib: PtrInt; ProcName: PAnsiChar): Pointer;
   begin
     MethodName:=ProcName;
     Result:=GetProcAddress(Lib, ProcName);
@@ -1891,7 +1891,7 @@ begin
 
   FreeOpenGL;
 
-  LibGL := LoadLibrary(PChar(dll));
+  LibGL := LoadLibrary(PAnsiChar(dll));
   if LibGL = 0 then raise Exception.Create('Could not load OpenGL from ' + dll);
   try
     @glAccum := GetGLProcAddress(LibGL, 'glAccum');

packages/opengl/src/glu.pp

@@ -487,7 +487,7 @@ implementation
     end;
 
 
-  procedure Loadglu(lib : pchar);
+  procedure Loadglu(lib : PAnsiChar);
     begin
       Freeglu;
       hlib:=LoadLibrary(lib);

packages/opengl/src/glut.pp

@@ -311,15 +311,15 @@ const
 
 var
 // GLUT initialization sub-API.
-  glutInit: procedure(argcp: PInteger; argv: PPChar); extdecl;
+  glutInit: procedure(argcp: PInteger; argv: PPAnsiChar); extdecl;
   glutInitDisplayMode: procedure(mode: Cardinal); extdecl;
-  glutInitDisplayString: procedure(const str: PChar); extdecl;
+  glutInitDisplayString: procedure(const str: PAnsiChar); extdecl;
   glutInitWindowPosition: procedure(x, y: Integer); extdecl;
   glutInitWindowSize: procedure(width, height: Integer); extdecl;
   glutMainLoop: procedure; extdecl;
 
 // GLUT window sub-API.
-  glutCreateWindow: function(const title: PChar): Integer; extdecl;
+  glutCreateWindow: function(const title: PAnsiChar): Integer; extdecl;
   glutCreateSubWindow: function(win, x, y, width, height: Integer): Integer; extdecl;
   glutDestroyWindow: procedure(win: Integer); extdecl;
   glutPostRedisplay: procedure; extdecl;
@@ -327,8 +327,8 @@ var
   glutSwapBuffers: procedure; extdecl;
   glutGetWindow: function: Integer; extdecl;
   glutSetWindow: procedure(win: Integer); extdecl;
-  glutSetWindowTitle: procedure(const title: PChar); extdecl;
-  glutSetIconTitle: procedure(const title: PChar); extdecl;
+  glutSetWindowTitle: procedure(const title: PAnsiChar); extdecl;
+  glutSetIconTitle: procedure(const title: PAnsiChar); extdecl;
   glutPositionWindow: procedure(x, y: Integer); extdecl;
   glutReshapeWindow: procedure(width, height: Integer); extdecl;
   glutPopWindow: procedure; extdecl;
@@ -354,10 +354,10 @@ var
   glutDestroyMenu: procedure(menu: Integer); extdecl;
   glutGetMenu: function: Integer; extdecl;
   glutSetMenu: procedure(menu: Integer); extdecl;
-  glutAddMenuEntry: procedure(const caption: PChar; value: Integer); extdecl;
-  glutAddSubMenu: procedure(const caption: PChar; submenu: Integer); extdecl;
-  glutChangeToMenuEntry: procedure(item: Integer; const caption: PChar; value: Integer); extdecl;
-  glutChangeToSubMenu: procedure(item: Integer; const caption: PChar; submenu: Integer); extdecl;
+  glutAddMenuEntry: procedure(const caption: PAnsiChar; value: Integer); extdecl;
+  glutAddSubMenu: procedure(const caption: PAnsiChar; submenu: Integer); extdecl;
+  glutChangeToMenuEntry: procedure(item: Integer; const caption: PAnsiChar; value: Integer); extdecl;
+  glutChangeToSubMenu: procedure(item: Integer; const caption: PAnsiChar; submenu: Integer); extdecl;
   glutRemoveMenuItem: procedure(item: Integer); extdecl;
   glutAttachMenu: procedure(button: Integer); extdecl;
   glutDetachMenu: procedure(button: Integer); extdecl;
@@ -399,7 +399,7 @@ var
   glutDeviceGet: function(t: GLenum): Integer; extdecl;
 
 // GLUT extension support sub-API
-  glutExtensionSupported: function(const name: PChar): Integer; extdecl;
+  glutExtensionSupported: function(const name: PAnsiChar): Integer; extdecl;
   glutGetModifiers: function: Integer; extdecl;
   glutLayerGet: function(t: GLenum): Integer; extdecl;
 
@@ -408,8 +408,8 @@ var
   glutBitmapWidth: function(font : pointer; character: Integer): Integer; extdecl;
   glutStrokeCharacter: procedure(font : pointer; character: Integer); extdecl;
   glutStrokeWidth: function(font : pointer; character: Integer): Integer; extdecl;
-  glutBitmapLength: function(font: pointer; const str: PChar): Integer; extdecl;
-  glutStrokeLength: function(font: pointer; const str: PChar): Integer; extdecl;
+  glutBitmapLength: function(font: pointer; const str: PAnsiChar): Integer; extdecl;
+  glutStrokeLength: function(font: pointer; const str: PAnsiChar): Integer; extdecl;
 
 // GLUT pre-built models sub-API
   glutWireSphere: procedure(radius: GLdouble; slices, stacks: GLint); extdecl;
@@ -450,7 +450,7 @@ var
 // GLUT game mode sub-API.
 
   //example glutGameModeString('1280x1024:32@75');
-  glutGameModeString : procedure (const AString : PChar); extdecl;
+  glutGameModeString : procedure (const AString : PAnsiChar); extdecl;
   glutEnterGameMode : function : integer; extdecl;
   glutLeaveGameMode : procedure; extdecl;
   glutGameModeGet : function (mode : GLenum) : integer; extdecl;
@@ -611,7 +611,7 @@ end;
 var
   MethodName: string = '';
 
-  function GetGLutProcAddress(Lib: PtrInt; ProcName: PChar): Pointer;
+  function GetGLutProcAddress(Lib: PtrInt; ProcName: PAnsiChar): Pointer;
   begin
     MethodName:=ProcName;
     Result:=GetProcAddress(Lib, ProcName);
@@ -621,7 +621,7 @@ begin
 
   UnloadGlut;
 
-  hDLL := LoadLibrary(PChar(dll));
+  hDLL := LoadLibrary(PAnsiChar(dll));
   if hDLL = 0 then raise Exception.Create('Could not load Glut from ' + dll);
   try
     @glutInit := GetGLutProcAddress(hDLL, 'glutInit');

packages/opengl/src/glx.pp

@@ -257,9 +257,9 @@ var
   glXUseXFont: procedure(font: XFont; first, count, list: cint); cdecl;
 
   // GLX 1.1 and later
-  glXQueryExtensionsString: function(dpy: PDisplay; screen: cint): PChar; cdecl;
-  glXQueryServerString: function(dpy: PDisplay; screen, name: cint): PChar; cdecl;
-  glXGetClientString: function(dpy: PDisplay; name: cint): PChar; cdecl;
+  glXQueryExtensionsString: function(dpy: PDisplay; screen: cint): PAnsiChar; cdecl;
+  glXQueryServerString: function(dpy: PDisplay; screen, name: cint): PAnsiChar; cdecl;
+  glXGetClientString: function(dpy: PDisplay; name: cint): PAnsiChar; cdecl;
 
   // GLX 1.2 and later
   glXGetCurrentDisplay: function: PDisplay; cdecl;
@@ -284,12 +284,12 @@ var
   glXGetSelectedEvent: procedure (dpy: PDisplay; drawable: TGLXDrawable; mask: Pculong); cdecl;
 
   // GLX 1.4 and later
-  glXGetProcAddress: function(procname: PChar): Pointer; cdecl;
+  glXGetProcAddress: function(procname: PAnsiChar): Pointer; cdecl;
 
   // Extensions:
 
   // GLX_ARB_get_proc_address
-  glXGetProcAddressARB: function(procname: PChar): Pointer; cdecl;
+  glXGetProcAddressARB: function(procname: PAnsiChar): Pointer; cdecl;
 
   // GLX_ARB_create_context
   //glXCreateContextAttribsARB -> internal_glXCreateContextAttribsARB in implementation
@@ -502,7 +502,7 @@ end;
 
 function GLX_ARB_get_proc_address(Display: PDisplay; Screen: Integer): boolean;
 var
-  GlxExtensions: PChar;
+  GlxExtensions: PAnsiChar;
 begin
   Result := GLX_version_1_1(Display);
   if Result then
@@ -515,7 +515,7 @@ end;
 
 function GLX_ARB_create_context(Display: PDisplay; Screen: Integer): boolean;
 var
-  GlxExtensions: PChar;
+  GlxExtensions: PAnsiChar;
 begin
   Result := GLX_version_1_1(Display);
   if Result then
@@ -528,7 +528,7 @@ end;
 
 function GLX_ARB_create_context_profile(Display: PDisplay; Screen: Integer): boolean;
 var
-  GlxExtensions: PChar;
+  GlxExtensions: PAnsiChar;
 begin
   Result := GLX_version_1_1(Display);
   if Result then
@@ -540,7 +540,7 @@ end;
 
 function GLX_ARB_create_context_robustness(Display: PDisplay; Screen: Integer): boolean;
 var
-  GlxExtensions: PChar;
+  GlxExtensions: PAnsiChar;
 begin
   Result := GLX_version_1_1(Display);
   if Result then
@@ -552,7 +552,7 @@ end;
 
 function GLX_ARB_multisample(Display: PDisplay; Screen: Integer): boolean;
 var
-  GlxExtensions: PChar;
+  GlxExtensions: PAnsiChar;
 begin
   Result := GLX_version_1_1(Display);
   if Result then
@@ -564,7 +564,7 @@ end;
 
 function GLX_EXT_swap_control(Display: PDisplay; Screen: Integer): boolean;
 var
-  GlxExtensions: PChar;
+  GlxExtensions: PAnsiChar;
 begin
   Result := GLX_version_1_1(Display);
   if Result then
@@ -577,7 +577,7 @@ end;
 
 function GLX_EXT_visual_info(Display: PDisplay; Screen: Integer): boolean;
 var
-  GlxExtensions: PChar;
+  GlxExtensions: PAnsiChar;
 begin
   Result := GLX_version_1_1(Display);
   if Result then
@@ -589,7 +589,7 @@ end;
 
 function GLX_MESA_pixmap_colormap(Display: PDisplay; Screen: Integer): boolean;
 var
-  GlxExtensions: PChar;
+  GlxExtensions: PAnsiChar;
 begin
   Result := GLX_version_1_1(Display);
   if Result then
@@ -602,7 +602,7 @@ end;
 
 function GLX_MESA_swap_control(Display: PDisplay; Screen: Integer): boolean;
 var
-  GlxExtensions: PChar;
+  GlxExtensions: PAnsiChar;
 begin
   Result := GLX_version_1_1(Display);
   if Result then
@@ -616,7 +616,7 @@ end;
 
 function GLX_SGI_swap_control(Display: PDisplay; Screen: Integer): boolean;
 var
-  GlxExtensions: PChar;
+  GlxExtensions: PAnsiChar;
 begin
   Result := GLX_version_1_1(Display);
   if Result then
@@ -629,7 +629,7 @@ end;
 
 function GLX_SGI_video_sync(Display: PDisplay; Screen: Integer): boolean;
 var
-  GlxExtensions: PChar;
+  GlxExtensions: PAnsiChar;
 begin
   Result := GLX_version_1_1(Display);
   if Result then
@@ -643,7 +643,7 @@ end;
 
 function GLX_SGIS_multisample(Display: PDisplay; Screen: Integer): boolean;
 var
-  GlxExtensions: PChar;
+  GlxExtensions: PAnsiChar;
 begin
   Result := GLX_version_1_1(Display);
   if Result then
@@ -653,7 +653,7 @@ begin
   end;
 end;
 
-function GetProc(handle: PtrInt; name: PChar): Pointer;
+function GetProc(handle: PtrInt; name: PAnsiChar): Pointer;
 begin
   if Assigned(glXGetProcAddress) then
     Result := glXGetProcAddress(name)

packages/opengl/src/tinygl.inc

@@ -230,7 +230,7 @@ syscall sysvbase TinyGLBase 658;
 {$ENDIF GLU_UNIT}
 
 {$IFDEF GLUT_UNIT}
-procedure _GLUTInit(gcl: pointer; argcp: PLongInt; argv: PPChar);
+procedure _GLUTInit(gcl: pointer; argcp: PLongInt; argv: PPAnsiChar);
 syscall sysvbase TinyGLBase 664;
 
 procedure _GLUTInitWindowPosition(gcl: pointer; x, y: Integer);
@@ -239,7 +239,7 @@ syscall sysvbase TinyGLBase 670;
 procedure _GLUTInitWindowSize(gcl: pointer; width, height: LongInt);
 syscall sysvbase TinyGLBase 676;
 
-function  _GLUTCreateWindow(gcl: pointer; const title: PChar): LongInt;
+function  _GLUTCreateWindow(gcl: pointer; const title: PAnsiChar): LongInt;
 syscall sysvbase TinyGLBase 682;
 
 procedure _GLUTFullScreen(gcl: pointer);
@@ -296,7 +296,7 @@ syscall sysvbase TinyGLBase 856;
 {$ENDIF GLUT_UNIT}
 
 {$IFDEF GL_UNIT}
-function _GLGetString(gcl: pointer; name: GLenum): PChar;
+function _GLGetString(gcl: pointer; name: GLenum): PAnsiChar;
 syscall sysvbase TinyGLBase 862;
 
 procedure _GLCallLists(gcl: pointer; n: GLsizei; atype: GLenum; const lists: Pointer);
@@ -448,7 +448,7 @@ begin
   _GLGetFloatv(tglContext, pname, params);
 end;
 
-function glGetString(name: GLenum): PChar; inline;
+function glGetString(name: GLenum): PAnsiChar; inline;
 begin
   glGetString:=_GLGetString(tglContext, name);
 end;
@@ -797,7 +797,7 @@ end;
 { ****************************************************************************************************** }
 
 {$IFDEF GLUT_UNIT}
-procedure GLUTInit(argcp: PLongInt; argv: PPChar); inline;
+procedure GLUTInit(argcp: PLongInt; argv: PPAnsiChar); inline;
 begin
   _GLUTInit(tglContext,argcp,argv);
 end;
@@ -832,7 +832,7 @@ begin
   _GLUTReshapeFunc(tglContext, f);
 end;
 
-function GLUTCreateWindow(const title: PChar): LongInt; inline;
+function GLUTCreateWindow(const title: PAnsiChar): LongInt; inline;
 begin
   GLUTCreateWindow:=_GLUTCreateWindow(tglContext, title);
 end;

packages/opengl/src/tinyglh.inc

@@ -58,7 +58,7 @@ procedure glFogi(pname: GLenum; param: GLint); inline;
 function  glGenLists(range: GLsizei): GLuint; inline;
 procedure glGetIntegerv(pname: GLenum; params: PGLint); inline;
 procedure glGetFloatv(pname: GLenum; params: PGLfloat); inline;
-function  glGetString(name: GLenum): PChar; inline;
+function  glGetString(name: GLenum): PAnsiChar; inline;
 
 procedure glHint(target, mode: GLenum); inline;
 
@@ -144,12 +144,12 @@ procedure gluPickMatrix(x:GLdouble; y:GLdouble; delX:GLdouble; delY:GLdouble; vi
 { ****************************************************************************************************** }
 
 {$IFDEF GLUT_UNIT}
-procedure GLUTInit(argcp: PLongInt; argv: PPChar); inline;
+procedure GLUTInit(argcp: PLongInt; argv: PPAnsiChar); inline;
 procedure GLUTInitDisplayMode(mode: Word); inline;
 procedure GLUTInitWindowPosition(x, y: Integer); inline;
 procedure GLUTInitWindowSize(width, height: LongInt); inline;
 
-function  GLUTCreateWindow(const title: PChar): LongInt; inline;
+function  GLUTCreateWindow(const title: PAnsiChar): LongInt; inline;
 procedure GLUTDestroyWindow(win: LongInt); inline;
 procedure GLUTDisplayFunc(f: TGlutVoidCallback); inline;
 procedure GLUTIdleFunc(f: TGlutVoidCallback); inline;