Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Fault.cpp → Fault.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "Fault.h"
#include <assert.h>
#if WIN32
#if defined(_WIN32) || defined(_WIN64)
#include "windows.h"
#endif

Expand All @@ -9,10 +9,9 @@
//----------------------------------------------------------------------------
void FaultHandler(const char* file, unsigned short line)
{
#if WIN32
#if defined(_WIN32) || defined(_WIN64)
// If you hit this line, it means one of the ASSERT macros failed.
DebugBreak();
#endif

assert(0);
}
}
46 changes: 0 additions & 46 deletions LockGuard.cpp

This file was deleted.

26 changes: 0 additions & 26 deletions LockGuard.h

This file was deleted.

31 changes: 0 additions & 31 deletions VS2017/VS2017.sln

This file was deleted.

142 changes: 0 additions & 142 deletions VS2017/VS2017/VS2017.vcxproj

This file was deleted.

75 changes: 0 additions & 75 deletions VS2017/VS2017/VS2017.vcxproj.filters

This file was deleted.

23 changes: 8 additions & 15 deletions fb_allocator.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,14 @@
#include "Fault.h"
#include <string.h>

// Define USE_LOCK to use the default lock implementation
#define USE_LOCKS
#ifdef USE_LOCKS
#include "LockGuard.h"
static LOCK_HANDLE _hLock;
#else
#pragma message("WARNING: Define software lock.")
typedef int LOCK_HANDLE;
static LOCK_HANDLE _hLock;

#define LK_CREATE() (1)
#define LK_DESTROY(h)
#define LK_LOCK(h)
#define LK_UNLOCK(h)
#endif
#pragma message("WARNING: Define software lock.")
typedef int LOCK_HANDLE;
static LOCK_HANDLE _hLock;

#define LK_CREATE() (1)
#define LK_DESTROY(h)
#define LK_LOCK(h)
#define LK_UNLOCK(h)

// Get a pointer to the client's area within a memory block
#define GET_CLIENT_PTR(_block_ptr_) \
Expand Down