From 0a8de141a6f77ad7d6c62ca33e48ba2647acd26c Mon Sep 17 00:00:00 2001 From: castano Date: Sat, 21 Mar 2009 07:43:15 +0000 Subject: [PATCH] Fix errors on win32. Define function pointers properly. --- src/nvtt/tests/driverapi.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/nvtt/tests/driverapi.cpp b/src/nvtt/tests/driverapi.cpp index da6c025..4e6a203 100644 --- a/src/nvtt/tests/driverapi.cpp +++ b/src/nvtt/tests/driverapi.cpp @@ -5,24 +5,24 @@ #include // Typedefs -typedef CUresult CUDAAPI (*cuInitPtr)( unsigned int Flags ); - -typedef CUresult CUDAAPI (*cuDeviceGetPtr)(CUdevice *device, int ordinal); -typedef CUresult CUDAAPI (*cuDeviceGetCountPtr)(int *count); -typedef CUresult CUDAAPI (*cuDeviceGetNamePtr)(char *name, int len, CUdevice dev); -typedef CUresult CUDAAPI (*cuDeviceComputeCapabilityPtr)(int *major, int *minor, CUdevice dev); -typedef CUresult CUDAAPI (*cuDeviceTotalMemPtr)(unsigned int *bytes, CUdevice dev); -typedef CUresult CUDAAPI (*cuDeviceGetPropertiesPtr)(CUdevprop *prop, CUdevice dev); -typedef CUresult CUDAAPI (*cuDeviceGetAttributePtr)(int *pi, CUdevice_attribute attrib, CUdevice dev); - -typedef CUresult CUDAAPI (*cuCtxCreatePtr)(CUcontext *pctx, unsigned int flags, CUdevice dev ); -typedef CUresult CUDAAPI (*cuCtxDestroyPtr)( CUcontext ctx ); -typedef CUresult CUDAAPI (*cuCtxAttachPtr)(CUcontext *pctx, unsigned int flags); -typedef CUresult CUDAAPI (*cuCtxDetachPtr)(CUcontext ctx); -typedef CUresult CUDAAPI (*cuCtxPushCurrentPtr)( CUcontext ctx ); -typedef CUresult CUDAAPI (*cuCtxPopCurrentPtr)( CUcontext *pctx ); -typedef CUresult CUDAAPI (*cuCtxGetDevicePtr)(CUdevice *device); -typedef CUresult CUDAAPI (*cuCtxSynchronizePtr)(void); +typedef CUresult (CUDAAPI * cuInitPtr)( unsigned int Flags ); + +typedef CUresult (CUDAAPI * cuDeviceGetPtr)(CUdevice *device, int ordinal); +typedef CUresult (CUDAAPI * cuDeviceGetCountPtr)(int *count); +typedef CUresult (CUDAAPI * cuDeviceGetNamePtr)(char *name, int len, CUdevice dev); +typedef CUresult (CUDAAPI * cuDeviceComputeCapabilityPtr)(int *major, int *minor, CUdevice dev); +typedef CUresult (CUDAAPI * cuDeviceTotalMemPtr)(unsigned int *bytes, CUdevice dev); +typedef CUresult (CUDAAPI * cuDeviceGetPropertiesPtr)(CUdevprop *prop, CUdevice dev); +typedef CUresult (CUDAAPI * cuDeviceGetAttributePtr)(int *pi, CUdevice_attribute attrib, CUdevice dev); + +typedef CUresult (CUDAAPI * cuCtxCreatePtr)(CUcontext *pctx, unsigned int flags, CUdevice dev ); +typedef CUresult (CUDAAPI * cuCtxDestroyPtr)( CUcontext ctx ); +typedef CUresult (CUDAAPI * cuCtxAttachPtr)(CUcontext *pctx, unsigned int flags); +typedef CUresult (CUDAAPI * cuCtxDetachPtr)(CUcontext ctx); +typedef CUresult (CUDAAPI * cuCtxPushCurrentPtr)( CUcontext ctx ); +typedef CUresult (CUDAAPI * cuCtxPopCurrentPtr)( CUcontext *pctx ); +typedef CUresult (CUDAAPI * cuCtxGetDevicePtr)(CUdevice *device); +typedef CUresult (CUDAAPI * cuCtxSynchronizePtr)(void); // A compressor inits CUDA and creates a context for each device.