Changeset 238

Show
Ignore:
Timestamp:
03/07/07 12:54:27 (1 year ago)
Author:
aldacron
Message:

* corrected several errors pointed out by lindquist in the forums: missing externs and typos in DerelictGL,GLU,SDL

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/DerelictGL/derelict/opengl/gl12.d

    r236 r238  
    4848        wglBindFunc(cast(void**)&glTexImage3D, "glTexImage3D", lib); 
    4949        wglBindFunc(cast(void**)&glTexSubImage3D, "glTexSubImage3D", lib); 
    50         wglBindFunc(cast(void**)&glTexSubImage3D, "glTexSubImage3D", lib); 
     50        wglBindFunc(cast(void**)&glCopyTexSubImage3D, "glCopyTexSubImage3D", lib); 
    5151    } 
    5252    else 
    …… 
    5555        bindFunc(glTexImage3D)("glTexImage3D", lib); 
    5656        bindFunc(glTexSubImage3D)("glTexSubImage3D", lib); 
    57         bindFunc(glTexSubImage3D)("glTexSubImage3D", lib); 
     57        bindFunc(glCopyTexSubImage3D)("glCopyTexSubImage3D", lib); 
    5858    } 
    5959} 

  • trunk/DerelictGL/derelict/opengl/gltypes.d

    r236 r238  
    5454enum : GLboolean 
    5555{ 
    56     G_FALSE    = 0x0, 
     56    GL_FALSE    = 0x0, 
    5757    GL_TRUE    = 0x1, 
    5858} 

  • trunk/DerelictGLU/derelict/opengl/glu.d

    r237 r238  
    295295typedef GLUtesselator GLUtriangulatorObj; 
    296296 
    297 typedef void function() _GLUfuncptr; 
    298  
     297version(Windows) 
     298{ 
     299    extern(Windows) typedef void function() _GLUfuncptr; 
     300} 
     301else 
     302{ 
     303    extern(C) typedef void function() _GLUfuncptr; 
     304} 
    299305//============================================================================== 
    300306// DLL FUNCTIONS 

  • trunk/DerelictSDL/derelict/sdl/audio.d

    r237 r238  
    4747    Uint16 padding; 
    4848    Uint32 size; 
    49     void (*callback)(void *userdata, Uint8 *stream, int len); 
     49    extern(C) void (*callback)(void *userdata, Uint8 *stream, int len); 
    5050    void *userdata; 
    5151} 

  • trunk/DerelictSDL/derelict/sdl/events.d

    r237 r238  
    226226} 
    227227 
    228 typedef int function(SDL_Event *event) SDL_EventFilter; 
     228extern(C) typedef int function(SDL_Event *event) SDL_EventFilter; 
    229229 
    230230enum : Uint8 

  • trunk/DerelictSDL/derelict/sdl/rwops.d

    r237 r238  
    5858struct SDL_RWops 
    5959{ 
    60     int (*seek)(SDL_RWops *context, int offset, int whence); 
    61     int (*read)(SDL_RWops *context, void *ptr, int size, int maxnum); 
    62     int (*write)(SDL_RWops *context, void *ptr, int size, int num); 
    63     int (*close)(SDL_RWops *context); 
     60    extern(C) 
     61    { 
     62        int (*seek)(SDL_RWops *context, int offset, int whence); 
     63        int (*read)(SDL_RWops *context, void *ptr, int size, int maxnum); 
     64        int (*write)(SDL_RWops *context, void *ptr, int size, int num); 
     65        int (*close)(SDL_RWops *context); 
     66    } 
     67     
    6468    Uint32 type; 
    6569    union Hidden 

  • trunk/DerelictSDL/derelict/sdl/timer.d

    r237 r238  
    4343} 
    4444 
    45 typedef Uint32 function(Uint32) SDL_TimerCallback; 
    46 typedef Uint32 function(Uint32,void*) SDL_NewTimerCallback; 
     45extern(C) 
     46{ 
     47    typedef Uint32 function(Uint32) SDL_TimerCallback; 
     48    typedef Uint32 function(Uint32,void*) SDL_NewTimerCallback; 
     49} 
    4750 
    4851alias void *SDL_TimerID;