/[pcsx2_0.9.7]/trunk/common/include/Utilities/General.h
ViewVC logotype

Diff of /trunk/common/include/Utilities/General.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 61 by william, Tue Sep 7 03:24:11 2010 UTC revision 62 by william, Tue Sep 7 11:08:22 2010 UTC
# Line 173  extern u64  GetTickFrequency(); Line 173  extern u64  GetTickFrequency();
173  extern u64  GetCPUTicks();  extern u64  GetCPUTicks();
174    
175  extern wxString GetOSVersionString();  extern wxString GetOSVersionString();
176    
177    extern void* __fastcall pcsx2_aligned_malloc(size_t size, size_t align);
178    extern void* __fastcall pcsx2_aligned_realloc(void* handle, size_t size, size_t align);
179    extern void pcsx2_aligned_free(void* pmem);
180    
181    // aligned_malloc: Implement/declare linux equivalents here!
182    #if !defined(_MSC_VER) && !defined(HAVE_ALIGNED_MALLOC)
183    #       define _aligned_malloc  pcsx2_aligned_malloc
184    #       define _aligned_free    pcsx2_aligned_free
185    #       define _aligned_realloc pcsx2_aligned_realloc
186    #endif

Legend:
Removed from v.61  
changed lines
  Added in v.62

  ViewVC Help
Powered by ViewVC 1.1.22