From: Hamed Gorjiara <hgorjiar@uci.edu>
Date: Wed, 25 Oct 2017 21:04:52 +0000 (-0700)
Subject: Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/constraint_compiler into... 
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=commitdiff_plain;h=3174431d74be819f6da1068eb4484a3a0d32bd7c;hp=-c

Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/constraint_compiler into hamed
---

3174431d74be819f6da1068eb4484a3a0d32bd7c
diff --combined src/mymemory.h
index 92fb0fe,766e6f6..97e177c
--- a/src/mymemory.h
+++ b/src/mymemory.h
@@@ -19,6 -19,8 +19,8 @@@
  
  #include "config.h"
  
+ #define SATCHECK_CONFIG
+ 
  /*
     void * ourmalloc(size_t size);
     void ourfree(void *ptr);
@@@ -26,7 -28,7 +28,7 @@@
     void * ourrealloc(void *ptr, size_t size);
   */
  
 -#ifdef SATCHECK_CONFIG
 +#if 1
  void *model_malloc(size_t size);
  void model_free(void *ptr);
  void *model_calloc(size_t count, size_t size);