Browse Source

* removed duplicate cdecl

peter 24 years ago
parent
commit
9586347e0d
3 changed files with 162 additions and 150 deletions
  1. 6 3
      packages/gtk/gtk/gtkeditable.pp
  2. 33 27
      packages/opengl/unix/glx.pp
  3. 123 120
      packages/svgalib/svgalib.pp

+ 6 - 3
packages/gtk/gtk/gtkeditable.pp

@@ -21,7 +21,7 @@
           ic_attr : PGdkICAttr;
           ic_attr : PGdkICAttr;
           clipboard_text : Pgchar;
           clipboard_text : Pgchar;
        end;
        end;
-     TGtkTextfunction = procedure (editable:PGtkEditable; time:guint32); cdecl; cdecl;
+     TGtkTextfunction = procedure (editable:PGtkEditable; time:guint32); cdecl;
 
 
   const
   const
      bm_TGtkEditable_has_selection = $1;
      bm_TGtkEditable_has_selection = $1;
@@ -140,10 +140,13 @@ end;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.3  2000-09-09 18:41:39  peter
+  Revision 1.4  2001-10-25 21:24:35  peter
+    * removed duplicate cdecl
+
+  Revision 1.3  2000/09/09 18:41:39  peter
     * fixes for gtk win32
     * fixes for gtk win32
 
 
   Revision 1.2  2000/07/13 11:33:21  michael
   Revision 1.2  2000/07/13 11:33:21  michael
   + removed logs
   + removed logs
- 
+
 }
 }

+ 33 - 27
packages/opengl/unix/glx.pp

@@ -132,35 +132,35 @@ type
   GLXContextID = TXID;
   GLXContextID = TXID;
 
 
 var
 var
-  glXChooseVisual: function(dpy: PDisplay; screen: Integer; var attribList: Integer): PXVisualInfo; cdecl; cdecl;
-  glXCreateContext: function(dpy: PDisplay; vis: PXVisualInfo; shareList: GLXContext; direct: Boolean): GLXContext; cdecl; cdecl;
-  glXDestroyContext: procedure(dpy: PDisplay; ctx: GLXContext); cdecl; cdecl;
-  glXMakeCurrent: function(dpy: PDisplay; drawable: GLXDrawable; ctx: GLXContext): Boolean; cdecl; cdecl;
-  glXCopyContext: procedure(dpy: PDisplay; src, dst: GLXContext; mask: LongWord); cdecl; cdecl;
-  glXSwapBuffers: procedure(dpy: PDisplay; drawable: GLXDrawable); cdecl; cdecl;
-  glXCreateGLXPixmap: function(dpy: PDisplay; visual: PXVisualInfo; pixmap: XPixmap): GLXPixmap; cdecl; cdecl;
-  glXDestroyGLXPixmap: procedure(dpy: PDisplay; pixmap: GLXPixmap); cdecl; cdecl;
-  glXQueryExtension: function(dpy: PDisplay; var errorb, event: Integer): Boolean; cdecl; cdecl;
-  glXQueryVersion: function(dpy: PDisplay; var maj, min: Integer): Boolean; cdecl; cdecl;
-  glXIsDirect: function(dpy: PDisplay; ctx: GLXContext): Boolean; cdecl; cdecl;
-  glXGetConfig: function(dpy: PDisplay; visual: PXVisualInfo; attrib: Integer; var value: Integer): Integer; cdecl; cdecl;
-  glXGetCurrentContext: function: GLXContext; cdecl; cdecl;
-  glXGetCurrentDrawable: function: GLXDrawable; cdecl; cdecl;
-  glXWaitGL: procedure; cdecl; cdecl;
-  glXWaitX: procedure; cdecl; cdecl;
-  glXUseXFont: procedure(font: XFont; first, count, list: Integer); cdecl; cdecl;
+  glXChooseVisual: function(dpy: PDisplay; screen: Integer; var attribList: Integer): PXVisualInfo; cdecl;
+  glXCreateContext: function(dpy: PDisplay; vis: PXVisualInfo; shareList: GLXContext; direct: Boolean): GLXContext; cdecl;
+  glXDestroyContext: procedure(dpy: PDisplay; ctx: GLXContext); cdecl;
+  glXMakeCurrent: function(dpy: PDisplay; drawable: GLXDrawable; ctx: GLXContext): Boolean; cdecl;
+  glXCopyContext: procedure(dpy: PDisplay; src, dst: GLXContext; mask: LongWord); cdecl;
+  glXSwapBuffers: procedure(dpy: PDisplay; drawable: GLXDrawable); cdecl;
+  glXCreateGLXPixmap: function(dpy: PDisplay; visual: PXVisualInfo; pixmap: XPixmap): GLXPixmap; cdecl;
+  glXDestroyGLXPixmap: procedure(dpy: PDisplay; pixmap: GLXPixmap); cdecl;
+  glXQueryExtension: function(dpy: PDisplay; var errorb, event: Integer): Boolean; cdecl;
+  glXQueryVersion: function(dpy: PDisplay; var maj, min: Integer): Boolean; cdecl;
+  glXIsDirect: function(dpy: PDisplay; ctx: GLXContext): Boolean; cdecl;
+  glXGetConfig: function(dpy: PDisplay; visual: PXVisualInfo; attrib: Integer; var value: Integer): Integer; cdecl;
+  glXGetCurrentContext: function: GLXContext; cdecl;
+  glXGetCurrentDrawable: function: GLXDrawable; cdecl;
+  glXWaitGL: procedure; cdecl;
+  glXWaitX: procedure; cdecl;
+  glXUseXFont: procedure(font: XFont; first, count, list: Integer); cdecl;
 
 
   // GLX 1.1 and later
   // GLX 1.1 and later
-  glXQueryExtensionsString: function(dpy: PDisplay; screen: Integer): PChar; cdecl; cdecl;
-  glXQueryServerString: function(dpy: PDisplay; screen, name: Integer): PChar; cdecl; cdecl;
-  glXGetClientString: function(dpy: PDisplay; name: Integer): PChar; cdecl; cdecl;
+  glXQueryExtensionsString: function(dpy: PDisplay; screen: Integer): PChar; cdecl;
+  glXQueryServerString: function(dpy: PDisplay; screen, name: Integer): PChar; cdecl;
+  glXGetClientString: function(dpy: PDisplay; name: Integer): PChar; cdecl;
 
 
   // Mesa GLX Extensions
   // Mesa GLX Extensions
-  glXCreateGLXPixmapMESA: function(dpy: PDisplay; visual: PXVisualInfo; pixmap: XPixmap; cmap: XColormap): GLXPixmap; cdecl; cdecl;
-  glXReleaseBufferMESA: function(dpy: PDisplay; d: GLXDrawable): Boolean; cdecl; cdecl;
-  glXCopySubBufferMESA: procedure(dpy: PDisplay; drawbale: GLXDrawable; x, y, width, height: Integer); cdecl; cdecl;
-  glXGetVideoSyncSGI: function(var counter: LongWord): Integer; cdecl; cdecl;
-  glXWaitVideoSyncSGI: function(divisor, remainder: Integer; var count: LongWord): Integer; cdecl; cdecl;
+  glXCreateGLXPixmapMESA: function(dpy: PDisplay; visual: PXVisualInfo; pixmap: XPixmap; cmap: XColormap): GLXPixmap; cdecl;
+  glXReleaseBufferMESA: function(dpy: PDisplay; d: GLXDrawable): Boolean; cdecl;
+  glXCopySubBufferMESA: procedure(dpy: PDisplay; drawbale: GLXDrawable; x, y, width, height: Integer); cdecl;
+  glXGetVideoSyncSGI: function(var counter: LongWord): Integer; cdecl;
+  glXWaitVideoSyncSGI: function(divisor, remainder: Integer; var count: LongWord): Integer; cdecl;
 
 
 
 
 // =======================================================
 // =======================================================
@@ -246,7 +246,10 @@ end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.2  2001-06-20 14:22:48  marco
+  Revision 1.3  2001-10-25 21:24:35  peter
+    * removed duplicate cdecl
+
+  Revision 1.2  2001/06/20 14:22:48  marco
    * Introduced Unix dir structure for opengl.
    * Introduced Unix dir structure for opengl.
 
 
   Revision 1.3  2001/06/20 13:59:20  marco
   Revision 1.3  2001/06/20 13:59:20  marco
@@ -269,7 +272,10 @@ end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.2  2001-06-20 14:22:48  marco
+  Revision 1.3  2001-10-25 21:24:35  peter
+    * removed duplicate cdecl
+
+  Revision 1.2  2001/06/20 14:22:48  marco
    * Introduced Unix dir structure for opengl.
    * Introduced Unix dir structure for opengl.
 
 
   Revision 1.3  2001/06/20 13:59:20  marco
   Revision 1.3  2001/06/20 13:59:20  marco

+ 123 - 120
packages/svgalib/svgalib.pp

@@ -12,7 +12,7 @@ unit SVGALib;
 
 
   Original conversion to FPK-Pascal done by Balazs Scheidler ([email protected])
   Original conversion to FPK-Pascal done by Balazs Scheidler ([email protected])
   08/29/1997
   08/29/1997
-  
+
   Modified by Matthias K"oppe <[email protected]>, 21-Sep-1997
   Modified by Matthias K"oppe <[email protected]>, 21-Sep-1997
   The compiler (FPK 0.9.1) seems to have a problem with external procedures
   The compiler (FPK 0.9.1) seems to have a problem with external procedures
   having void argument list (wrong number of arguments is taken from stack.)
   having void argument list (wrong number of arguments is taken from stack.)
@@ -22,7 +22,7 @@ unit SVGALib;
   Modified by Michael Van Canneyt ([email protected]) to
   Modified by Michael Van Canneyt ([email protected]) to
   support version 0.99.5 of the compiler. (March 1998) Removed the void replacements.
   support version 0.99.5 of the compiler. (March 1998) Removed the void replacements.
   Added makefile and 2 testprograms. Tested with svgalib 1.2.12.
   Added makefile and 2 testprograms. Tested with svgalib 1.2.12.
-   
+
   ************************************************************************}
   ************************************************************************}
 
 
 interface
 interface
@@ -35,7 +35,7 @@ interface
 {$linklib c}
 {$linklib c}
 
 
 const
 const
-  GTEXT             = 0;		{ Compatible with VGAlib v1.2 }
+  GTEXT             = 0;                { Compatible with VGAlib v1.2 }
   G320x200x16       = 1;
   G320x200x16       = 1;
   G640x200x16       = 2;
   G640x200x16       = 2;
   G640x350x16       = 3;
   G640x350x16       = 3;
@@ -72,9 +72,9 @@ const
   G1024x768x16      = 30;
   G1024x768x16      = 30;
   G1280x1024x16     = 31;
   G1280x1024x16     = 31;
 
 
-  G720x348x2        = 32;		{ Hercules emulation mode }
+  G720x348x2        = 32;               { Hercules emulation mode }
 
 
-  G320x200x16M32    = 33;	{ 32-bit per pixel modes. }
+  G320x200x16M32    = 33;       { 32-bit per pixel modes. }
   G640x480x16M32    = 34;
   G640x480x16M32    = 34;
   G800x600x16M32    = 35;
   G800x600x16M32    = 35;
   G1024x768x16M32   = 36;
   G1024x768x16M32   = 36;
@@ -96,7 +96,7 @@ const
   G1600x1200x16M32  = 49;
   G1600x1200x16M32  = 49;
 
 
   GLASTMODE         = 49;
   GLASTMODE         = 49;
-  
+
 { Extensions to VGAlib v1.2: }
 { Extensions to VGAlib v1.2: }
 
 
 { blit flags }
 { blit flags }
@@ -108,67 +108,67 @@ const
   HAVE_BLITWAIT         = 16;
   HAVE_BLITWAIT         = 16;
 
 
 { other flags }
 { other flags }
-  HAVE_RWPAGE           = 1;		{ vga_setreadpage() / vga_setwritepage() available }
-  IS_INTERLACED         = 2;		{ mode is interlaced }
-  IS_MODEX              = 4;		{ ModeX style 256 colors }
-  IS_DYNAMICMODE        = 8;	        { Dynamic defined mode }
-  CAPABLE_LINEAR        = 16;	        { Can go to linear addressing mode. }
-  IS_LINEAR             = 32;		{ Linear addressing enabled. }
-  EXT_INFO_AVAILABLE    = 64;	        { Returned modeinfo contains valid extended fields }
-  RGB_MISORDERED        = 128;  	{ Mach32 32bpp uses 0BGR instead of BGR0. }
+  HAVE_RWPAGE           = 1;            { vga_setreadpage() / vga_setwritepage() available }
+  IS_INTERLACED         = 2;            { mode is interlaced }
+  IS_MODEX              = 4;            { ModeX style 256 colors }
+  IS_DYNAMICMODE        = 8;            { Dynamic defined mode }
+  CAPABLE_LINEAR        = 16;           { Can go to linear addressing mode. }
+  IS_LINEAR             = 32;           { Linear addressing enabled. }
+  EXT_INFO_AVAILABLE    = 64;           { Returned modeinfo contains valid extended fields }
+  RGB_MISORDERED        = 128;          { Mach32 32bpp uses 0BGR instead of BGR0. }
     { As of this version 1.25 also used to signal if real RGB
     { As of this version 1.25 also used to signal if real RGB
        (red first in memory) is used instead of BGR (Mach32 DAC 4) }
        (red first in memory) is used instead of BGR (Mach32 DAC 4) }
-  HAVE_EXT_SET          = 256;	        { vga_ext_set() available }
+  HAVE_EXT_SET          = 256;          { vga_ext_set() available }
 
 
 { Valid values for what in vga_ext_set: }
 { Valid values for what in vga_ext_set: }
 const
 const
-  VGA_EXT_AVAILABLE   = 0;	{ supported flags }
-  VGA_EXT_SET	      = 1;	{ set flag(s) }
-  VGA_EXT_CLEAR	      = 2;	{ clear flag(s) }
-  VGA_EXT_RESET	      = 3;	{ set/clear flag(s) }
-  VGA_EXT_PAGE_OFFSET = 4;	{ set an offset for all subsequent vga_set*page() calls }
+  VGA_EXT_AVAILABLE   = 0;      { supported flags }
+  VGA_EXT_SET         = 1;      { set flag(s) }
+  VGA_EXT_CLEAR       = 2;      { clear flag(s) }
+  VGA_EXT_RESET       = 3;      { set/clear flag(s) }
+  VGA_EXT_PAGE_OFFSET = 4;      { set an offset for all subsequent vga_set*page() calls }
     { Like: vga_ext_set(VGA_EXT_PAGE_OFFSET, 42);           }
     { Like: vga_ext_set(VGA_EXT_PAGE_OFFSET, 42);           }
     { returns the previous offset value.                    }
     { returns the previous offset value.                    }
 
 
  { Valid params for VGA_EXT_AVAILABLE: }
  { Valid params for VGA_EXT_AVAILABLE: }
-  VGA_AVAIL_SET	       = 0;	{ vga_ext_set sub funcs }
-  VGA_AVAIL_ACCEL      = 1;	{ vga_accel sub funcs }
-  VGA_AVAIL_FLAGS      = 2;	{ known flags for VGA_EXT_SET }
-  
+  VGA_AVAIL_SET        = 0;     { vga_ext_set sub funcs }
+  VGA_AVAIL_ACCEL      = 1;     { vga_accel sub funcs }
+  VGA_AVAIL_FLAGS      = 2;     { known flags for VGA_EXT_SET }
+
  { Known flags to vga_ext_set() }
  { Known flags to vga_ext_set() }
-  VGA_CLUT8	       = 1;	{ 8 bit DAC entries }
+  VGA_CLUT8            = 1;     { 8 bit DAC entries }
 
 
   { Acceleration interface. }
   { Acceleration interface. }
 
 
   { Accel operations. }
   { Accel operations. }
-  ACCEL_FILLBOX		   = 1;	{ Simple solid fill. }
-  ACCEL_SCREENCOPY	   = 2;	{ Simple screen-to-screen BLT. }
-  ACCEL_PUTIMAGE	   = 3;	{ Straight image transfer. }
-  ACCEL_DRAWLINE	   = 4;	{ General line draw. }
-  ACCEL_SETFGCOLOR	   = 5;	{ Set foreground color. }
-  ACCEL_SETBGCOLOR	   = 6;	{ Set background color. }
-  ACCEL_SETTRANSPARENCY	   = 7;	{ Set transparency mode. }
-  ACCEL_SETRASTEROP	   = 8;	{ Set raster-operation. }
-  ACCEL_PUTBITMAP	   = 9;	{ Color-expand bitmap. }
-  ACCEL_SCREENCOPYBITMAP   = 10;	{ Color-exand from screen. }
-  ACCEL_DRAWHLINELIST	   = 11;	{ Draw horizontal spans. }
-  ACCEL_SETMODE		   = 12;	{ Set blit strategy. }
-  ACCEL_SYNC		   = 13;	{ Wait for blits to finish. }
+  ACCEL_FILLBOX            = 1; { Simple solid fill. }
+  ACCEL_SCREENCOPY         = 2; { Simple screen-to-screen BLT. }
+  ACCEL_PUTIMAGE           = 3; { Straight image transfer. }
+  ACCEL_DRAWLINE           = 4; { General line draw. }
+  ACCEL_SETFGCOLOR         = 5; { Set foreground color. }
+  ACCEL_SETBGCOLOR         = 6; { Set background color. }
+  ACCEL_SETTRANSPARENCY    = 7; { Set transparency mode. }
+  ACCEL_SETRASTEROP        = 8; { Set raster-operation. }
+  ACCEL_PUTBITMAP          = 9; { Color-expand bitmap. }
+  ACCEL_SCREENCOPYBITMAP   = 10;        { Color-exand from screen. }
+  ACCEL_DRAWHLINELIST      = 11;        { Draw horizontal spans. }
+  ACCEL_SETMODE            = 12;        { Set blit strategy. }
+  ACCEL_SYNC               = 13;        { Wait for blits to finish. }
 
 
   { Corresponding bitmask. }
   { Corresponding bitmask. }
-  ACCELFLAG_FILLBOX	      = $1;	{ Simple solid fill. }
-  ACCELFLAG_SCREENCOPY	      = $2;	{ Simple screen-to-screen BLT. }
-  ACCELFLAG_PUTIMAGE	      = $4;	{ Straight image transfer. }
-  ACCELFLAG_DRAWLINE	      = $8;	{ General line draw. }
-  ACCELFLAG_SETFGCOLOR	      = $10;	{ Set foreground color. }
-  ACCELFLAG_SETBGCOLOR	      = $20;	{ Set background color. }
-  ACCELFLAG_SETTRANSPARENCY   = $40;	{ Set transparency mode. }
-  ACCELFLAG_SETRASTEROP	      = $80;	{ Set raster-operation. }
-  ACCELFLAG_PUTBITMAP	      = $100;	{ Color-expand bitmap. }
-  ACCELFLAG_SCREENCOPYBITMAP  = $200;	{ Color-exand from screen. }
-  ACCELFLAG_DRAWHLINELIST     = $400;	{ Draw horizontal spans. }
-  ACCELFLAG_SETMODE	      = $800;	{ Set blit strategy. }
-  ACCELFLAG_SYNC	      = $1000;	{ Wait for blits to finish. }
+  ACCELFLAG_FILLBOX           = $1;     { Simple solid fill. }
+  ACCELFLAG_SCREENCOPY        = $2;     { Simple screen-to-screen BLT. }
+  ACCELFLAG_PUTIMAGE          = $4;     { Straight image transfer. }
+  ACCELFLAG_DRAWLINE          = $8;     { General line draw. }
+  ACCELFLAG_SETFGCOLOR        = $10;    { Set foreground color. }
+  ACCELFLAG_SETBGCOLOR        = $20;    { Set background color. }
+  ACCELFLAG_SETTRANSPARENCY   = $40;    { Set transparency mode. }
+  ACCELFLAG_SETRASTEROP       = $80;    { Set raster-operation. }
+  ACCELFLAG_PUTBITMAP         = $100;   { Color-expand bitmap. }
+  ACCELFLAG_SCREENCOPYBITMAP  = $200;   { Color-exand from screen. }
+  ACCELFLAG_DRAWHLINELIST     = $400;   { Draw horizontal spans. }
+  ACCELFLAG_SETMODE           = $800;   { Set blit strategy. }
+  ACCELFLAG_SYNC              = $1000;  { Wait for blits to finish. }
 
 
   { Mode for SetTransparency. }
   { Mode for SetTransparency. }
   DISABLE_TRANSPARENCY_COLOR  =  0;
   DISABLE_TRANSPARENCY_COLOR  =  0;
@@ -177,15 +177,15 @@ const
   ENABLE_BITMAP_TRANSPARENCY  =  3;
   ENABLE_BITMAP_TRANSPARENCY  =  3;
 
 
   { Flags for SetMode (accelerator interface). }
   { Flags for SetMode (accelerator interface). }
-  BLITS_SYNC		      =  0;
-  BLITS_IN_BACKGROUND	      =  $1;
+  BLITS_SYNC                  =  0;
+  BLITS_IN_BACKGROUND         =  $1;
 
 
   { Raster ops. }
   { Raster ops. }
-  ROP_COPY		      =  0;	{ Straight copy. }
-  ROP_OR		      =  1;	{ Source OR destination. }
-  ROP_AND		      =  2;	{ Source AND destination. }
-  ROP_XOR		      =  3;	{ Source XOR destination. }
-  ROP_INVERT		      =  4;	{ Invert destination. }
+  ROP_COPY                    =  0;     { Straight copy. }
+  ROP_OR                      =  1;     { Source OR destination. }
+  ROP_AND                     =  2;     { Source AND destination. }
+  ROP_XOR                     =  3;     { Source XOR destination. }
+  ROP_INVERT                  =  4;     { Invert destination. }
 
 
 const
 const
   { chipsets }
   { chipsets }
@@ -206,12 +206,12 @@ const
   MACH64                = 14;
   MACH64                = 14;
 
 
     { Hor. sync: }
     { Hor. sync: }
-  MON640_60             = 0;	{ 31.5 KHz (standard VGA) }
-  MON800_56             = 1;	{ 35.1 KHz (old SVGA) }
-  MON1024_43I           = 2;	{ 35.5 KHz (low-end SVGA, 8514) }
-  MON800_60             = 3;	{ 37.9 KHz (SVGA) }
-  MON1024_60            = 4;	{ 48.3 KHz (SVGA non-interlaced) }
-  MON1024_70            = 5;	{ 56.0 KHz (SVGA high frequency) }
+  MON640_60             = 0;    { 31.5 KHz (standard VGA) }
+  MON800_56             = 1;    { 35.1 KHz (old SVGA) }
+  MON1024_43I           = 2;    { 35.5 KHz (low-end SVGA, 8514) }
+  MON800_60             = 3;    { 37.9 KHz (SVGA) }
+  MON1024_60            = 4;    { 48.3 KHz (SVGA non-interlaced) }
+  MON1024_70            = 5;    { 56.0 KHz (SVGA high frequency) }
   MON1024_72            = 6;
   MON1024_72            = 6;
 
 
 {
 {
@@ -220,7 +220,7 @@ const
  }
  }
   VGA_MOUSEEVENT        = 1;
   VGA_MOUSEEVENT        = 1;
   VGA_KEYEVENT          = 2;
   VGA_KEYEVENT          = 2;
-  
+
 
 
 type
 type
   pvga_modeinfo = ^vga_modeinfo;
   pvga_modeinfo = ^vga_modeinfo;
@@ -229,21 +229,21 @@ type
     height,
     height,
     bytesperpixel,
     bytesperpixel,
     colors,
     colors,
-    linewidth,		{ scanline width in bytes }
-    maxlogicalwidth,	{ maximum logical scanline width }
-    startaddressrange,	{ changeable bits set }
-    maxpixels,		{ video memory / bytesperpixel }
-    haveblit,		{ mask of blit functions available }
-    flags: Longint;    	{ other flags }
- 
+    linewidth,          { scanline width in bytes }
+    maxlogicalwidth,    { maximum logical scanline width }
+    startaddressrange,  { changeable bits set }
+    maxpixels,          { video memory / bytesperpixel }
+    haveblit,           { mask of blit functions available }
+    flags: Longint;     { other flags }
+
     { Extended fields: }
     { Extended fields: }
- 
-    chiptype,		{ Chiptype detected }
-    memory,		{ videomemory in KB }
-    linewidth_unit: Longint;	{ Use only a multiple of this as parameter for set_logicalwidth and
+
+    chiptype,           { Chiptype detected }
+    memory,             { videomemory in KB }
+    linewidth_unit: Longint;    { Use only a multiple of this as parameter for set_logicalwidth and
                                   set_displaystart }
                                   set_displaystart }
-    linear_aperture: PChar;	{ points to mmap secondary mem aperture of card (NULL if unavailable) }
-    aperture_size: Longint;	{ size of aperture in KB if size>=videomemory. 0 if unavail }
+    linear_aperture: PChar;     { points to mmap secondary mem aperture of card (NULL if unavailable) }
+    aperture_size: Longint;     { size of aperture in KB if size>=videomemory. 0 if unavail }
     set_aperture_page: procedure (page: Longint);
     set_aperture_page: procedure (page: Longint);
     { if aperture_size<videomemory select a memory page }
     { if aperture_size<videomemory select a memory page }
     extensions: Pointer;        { points to copy of eeprom for mach32 }
     extensions: Pointer;        { points to copy of eeprom for mach32 }
@@ -305,7 +305,7 @@ Procedure vga_waitretrace; cdecl;
 Function vga_claimvideomemory(n: Longint): Longint; cdecl;
 Function vga_claimvideomemory(n: Longint): Longint; cdecl;
 Procedure vga_disabledriverreport; cdecl;
 Procedure vga_disabledriverreport; cdecl;
 Function vga_setmodeX: Longint; cdecl;
 Function vga_setmodeX: Longint; cdecl;
-Function vga_init: Longint;	{ Used to return void in svgalib <= 1.12. } cdecl;
+Function vga_init: Longint;     { Used to return void in svgalib <= 1.12. } cdecl;
 Function vga_getmousetype: Longint; cdecl;
 Function vga_getmousetype: Longint; cdecl;
 Function vga_getmonitortype: Longint; cdecl;
 Function vga_getmonitortype: Longint; cdecl;
 Procedure vga_setmousesupport(s: Longint); cdecl;
 Procedure vga_setmousesupport(s: Longint); cdecl;
@@ -314,7 +314,7 @@ Procedure vga_unlockvc; cdecl;
 Function vga_getkey: Longint; cdecl;
 Function vga_getkey: Longint; cdecl;
 Procedure vga_runinbackground(s: Longint); cdecl;
 Procedure vga_runinbackground(s: Longint); cdecl;
 Function vga_oktowrite: Longint; cdecl;
 Function vga_oktowrite: Longint; cdecl;
-Procedure vga_copytoplanar256(virtualp: PChar; pitch: Longint; 
+Procedure vga_copytoplanar256(virtualp: PChar; pitch: Longint;
                                   voffset: Longint; vpitch: Longint; w: Longint; h: Longint);cdecl;
                                   voffset: Longint; vpitch: Longint; w: Longint; h: Longint);cdecl;
 Procedure vga_copytoplanar16(virtualp: PChar; pitch, voffset, vpitch, w, h: Longint); cdecl;
 Procedure vga_copytoplanar16(virtualp: PChar; pitch, voffset, vpitch, w, h: Longint); cdecl;
 Procedure vga_copytoplane(virtualp: PChar; pitch, voffset, vpitch, w, h, plane: Longint); cdecl;
 Procedure vga_copytoplane(virtualp: PChar; pitch, voffset, vpitch, w, h, plane: Longint); cdecl;
@@ -357,8 +357,8 @@ type
     tv_sec, tv_usec: Longint;
     tv_sec, tv_usec: Longint;
   end;
   end;
 
 
-Function vga_waitevent(which: Longint; var inp, outp, excp: fd_set; 
-			     timeout: timeval): Longint;cdecl;
+Function vga_waitevent(which: Longint; var inp, outp, excp: fd_set;
+                             timeout: timeval): Longint;cdecl;
 
 
 {
 {
  * return value >= has bits set for mouse/keyboard events detected.
  * return value >= has bits set for mouse/keyboard events detected.
@@ -374,41 +374,41 @@ Function vga_waitevent(which: Longint; var inp, outp, excp: fd_set;
 
 
 const
 const
   CONTEXT_VIRTUAL  = 0;
   CONTEXT_VIRTUAL  = 0;
-  CONTEXT_PAGED	   = 1;
+  CONTEXT_PAGED    = 1;
   CONTEXT_LINEAR   = 2;
   CONTEXT_LINEAR   = 2;
-  CONTEXT_MODEX	   = 3;
+  CONTEXT_MODEX    = 3;
   CONTEXT_PLANAR16 = 4;
   CONTEXT_PLANAR16 = 4;
-		   
+
 const
 const
-  MODEFLAG_PAGEFLIPPING_CAPABLE	   = $01;
+  MODEFLAG_PAGEFLIPPING_CAPABLE    = $01;
   MODEFLAG_TRIPLEBUFFERING_CAPABLE = $02;
   MODEFLAG_TRIPLEBUFFERING_CAPABLE = $02;
-  MODEFLAG_PAGEFLIPPING_ENABLED	   = $04;
+  MODEFLAG_PAGEFLIPPING_ENABLED    = $04;
   MODEFLAG_TRIPLEBUFFERING_ENABLED = $08;
   MODEFLAG_TRIPLEBUFFERING_ENABLED = $08;
-  MODEFLAG_FLIPPAGE_BANKALIGNED	   = $10;
-  MODEFLAG_32BPP_SHIFT8		   = $20;
-  MODEFLAG_24BPP_REVERSED	   = $20;
-				   
+  MODEFLAG_FLIPPAGE_BANKALIGNED    = $10;
+  MODEFLAG_32BPP_SHIFT8            = $20;
+  MODEFLAG_24BPP_REVERSED          = $20;
+
 type
 type
   PGraphicsContext = ^TGraphicsContext;
   PGraphicsContext = ^TGraphicsContext;
   TGraphicsContext = record
   TGraphicsContext = record
-		       ModeType: Byte;
-		       ModeFlags: Byte;
-		       Dummy: Byte;
-		       FlipPage: Byte;
-		       Width: LongInt;
-		       Height: LongInt;
-		       BytesPerPixel: LongInt;
-		       Colors: LongInt;
-		       BitsPerPixel: LongInt;
-		       ByteWidth: LongInt;
-		       VBuf: pointer;
-		       Clip: LongInt;
-		       ClipX1: LongInt;
-		       ClipY1: LongInt;
-		       ClipX2: LongInt;
-		       ClipY2: LongInt;
-		       ff: pointer;
-		     end;	     
+                       ModeType: Byte;
+                       ModeFlags: Byte;
+                       Dummy: Byte;
+                       FlipPage: Byte;
+                       Width: LongInt;
+                       Height: LongInt;
+                       BytesPerPixel: LongInt;
+                       Colors: LongInt;
+                       BitsPerPixel: LongInt;
+                       ByteWidth: LongInt;
+                       VBuf: pointer;
+                       Clip: LongInt;
+                       ClipX1: LongInt;
+                       ClipY1: LongInt;
+                       ClipX2: LongInt;
+                       ClipY2: LongInt;
+                       ff: pointer;
+                     end;
 
 
 { Configuration
 { Configuration
 }
 }
@@ -422,7 +422,7 @@ Procedure gl_setcontext(gc: PGraphicsContext); cdecl;
 Procedure gl_getcontext(gc: PGraphicsContext); cdecl;
 Procedure gl_getcontext(gc: PGraphicsContext); cdecl;
 Procedure gl_freecontext(gc: PGraphicsContext); cdecl;
 Procedure gl_freecontext(gc: PGraphicsContext); cdecl;
 
 
-{ Line drawing 
+{ Line drawing
 }
 }
 Procedure gl_setpixel(x, y, c: LongInt); cdecl;
 Procedure gl_setpixel(x, y, c: LongInt); cdecl;
 Procedure gl_setpixelrgb(x, y, r, g, b: LongInt); cdecl;
 Procedure gl_setpixelrgb(x, y, r, g, b: LongInt); cdecl;
@@ -443,7 +443,7 @@ Procedure gl_putboxmask(x, y, w, h: LongInt; dp: pointer); cdecl;
 Procedure gl_copybox(x1, y1, w, h, x2, y2: LongInt); cdecl;
 Procedure gl_copybox(x1, y1, w, h, x2, y2: LongInt); cdecl;
 Procedure gl_copyboxtocontext(x1, y1, w, h: LongInt; var gc: TGraphicsContext; x2, y2: LongInt); cdecl;
 Procedure gl_copyboxtocontext(x1, y1, w, h: LongInt; var gc: TGraphicsContext; x2, y2: LongInt); cdecl;
 Procedure gl_copyboxfromcontext(var gc: TGraphicsContext; x1, y1, w, h, x2, y2: LongInt); cdecl;
 Procedure gl_copyboxfromcontext(var gc: TGraphicsContext; x1, y1, w, h, x2, y2: LongInt); cdecl;
-{ The following Functions only work in 256-color modes: } cdecl;
+{ The following Functions only work in 256-color modes: }
 Procedure gl_compileboxmask(w, h: LongInt; sdp, dpp: pointer); cdecl;
 Procedure gl_compileboxmask(w, h: LongInt; sdp, dpp: pointer); cdecl;
 Function gl_compiledboxmasksize(w, h: LongInt; sdp: pointer): LongInt; cdecl;
 Function gl_compiledboxmasksize(w, h: LongInt; sdp: pointer): LongInt; cdecl;
 Procedure gl_putboxmaskcompiled(x, y, w, h: LongInt; dp: pointer); cdecl;
 Procedure gl_putboxmaskcompiled(x, y, w, h: LongInt; dp: pointer); cdecl;
@@ -473,7 +473,7 @@ Function gl_enablepageflipping(var gc: TGraphicsContext): LongInt; cdecl;
 const
 const
   WRITEMODE_OVERWRITE = 0;
   WRITEMODE_OVERWRITE = 0;
   WRITEMODE_MASKED    = 1;
   WRITEMODE_MASKED    = 1;
-  FONT_EXPANDED	      = 0;
+  FONT_EXPANDED       = 0;
   FONT_COMPRESSED     = 2;
   FONT_COMPRESSED     = 2;
 
 
 Procedure gl_expandfont(fw, fh, c: LongInt; sfdp, dfdp: pointer); cdecl;
 Procedure gl_expandfont(fw, fh, c: LongInt; sfdp, dfdp: pointer); cdecl;
@@ -484,12 +484,12 @@ Procedure gl_write(x, y: LongInt; s: PChar); cdecl;
 Procedure gl_writen(x, y, n: LongInt; s: PChar); cdecl;
 Procedure gl_writen(x, y, n: LongInt; s: PChar); cdecl;
 Procedure gl_setfontcolors(bg, fg: LongInt); cdecl;
 Procedure gl_setfontcolors(bg, fg: LongInt); cdecl;
 
 
-{extern unsigned char *gl_font8x8;	/* compressed 8x8 font */}
+{extern unsigned char *gl_font8x8;      /* compressed 8x8 font */}
 
 
 type
 type
   TRGB = record
   TRGB = record
-	   red, green, blue: Byte
-	 end;		    
+           red, green, blue: Byte
+         end;
 type
 type
   TRGBPalette = array[0..255] of TRGB;
   TRGBPalette = array[0..255] of TRGB;
 
 
@@ -503,7 +503,7 @@ Procedure gl_setrgbpalette; cdecl;
 
 
 Procedure gl_font8x8; { ACTUALLY A DATA POINTER } cdecl;
 Procedure gl_font8x8; { ACTUALLY A DATA POINTER } cdecl;
 
 
-implementation 
+implementation
 
 
 function vga_setmode(mode: Longint): Longint; Cdecl; External;
 function vga_setmode(mode: Longint): Longint; Cdecl; External;
 function vga_hasmode(mode: Longint): Boolean; Cdecl; External;
 function vga_hasmode(mode: Longint): Boolean; Cdecl; External;
@@ -556,7 +556,7 @@ procedure vga_waitretrace; Cdecl; External;
 function vga_claimvideomemory(n: Longint): Longint; Cdecl; External;
 function vga_claimvideomemory(n: Longint): Longint; Cdecl; External;
 procedure vga_disabledriverreport; Cdecl; External;
 procedure vga_disabledriverreport; Cdecl; External;
 function vga_setmodeX: Longint; Cdecl; External;
 function vga_setmodeX: Longint; Cdecl; External;
-function vga_init: Longint; Cdecl; External;	{ Used to return void in svgalib <= 1.12. }
+function vga_init: Longint; Cdecl; External;    { Used to return void in svgalib <= 1.12. }
 function vga_getmousetype: Longint; Cdecl; External;
 function vga_getmousetype: Longint; Cdecl; External;
 function vga_getmonitortype: Longint; Cdecl; External;
 function vga_getmonitortype: Longint; Cdecl; External;
 procedure vga_setmousesupport(s: Longint); Cdecl; External;
 procedure vga_setmousesupport(s: Longint); Cdecl; External;
@@ -597,7 +597,7 @@ int vga_accel(unsigned operation,...);
 }
 }
 
 
 function vga_waitevent(which: Longint; var inp, outp, excp: fd_set;
 function vga_waitevent(which: Longint; var inp, outp, excp: fd_set;
-			     timeout: timeval): Longint; Cdecl; External;
+                             timeout: timeval): Longint; Cdecl; External;
 
 
 
 
 { vgagl }
 { vgagl }
@@ -660,7 +660,10 @@ procedure gl_font8x8; Cdecl; External;
 end.
 end.
 
 
   $Log$
   $Log$
-  Revision 1.2  2000-07-13 11:33:31  michael
+  Revision 1.3  2001-10-25 21:24:35  peter
+    * removed duplicate cdecl
+
+  Revision 1.2  2000/07/13 11:33:31  michael
   + removed logs
   + removed logs
- 
+
 }
 }