Merge pull request #16 from RedisLabs/include_file

Mainly corrects include for redismodule.h in alloc
master
Dvir Volk 8 years ago committed by GitHub
commit 240a0d2538

@ -26,4 +26,4 @@ test_heap: test_heap.o heap.o vector.o
test_priority_queue: test_priority_queue.o priority_queue.o heap.o vector.o test_priority_queue: test_priority_queue.o priority_queue.o heap.o vector.o
$(CC) -Wall -o test_priority_queue priority_queue.o heap.o vector.o test_priority_queue.o -lc -O0 $(CC) -Wall -o test_priority_queue priority_queue.o heap.o vector.o test_priority_queue.o -lc -O0
@(sh -c ./test_heap) @(sh -c ./test_priority_queue)

@ -1,8 +1,6 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "../redismodule.h"
#include "alloc.h" #include "alloc.h"
/* A patched implementation of strdup that will use our patched calloc */ /* A patched implementation of strdup that will use our patched calloc */

@ -17,7 +17,7 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include "../redismodule.h" #include <redismodule.h>
char *rmalloc_strndup(const char *s, size_t n); char *rmalloc_strndup(const char *s, size_t n);

@ -32,7 +32,7 @@ int main(int argc, char **argv) {
assert(99 == n); assert(99 == n);
Vector_Free(v); Vector_Free(v);
printf("PASS!"); printf("PASS!\n");
return 0; return 0;
} }

@ -1,4 +1,4 @@
#include <printf.h> #include <stdio.h>
#include "assert.h" #include "assert.h"
#include "priority_queue.h" #include "priority_queue.h"
@ -32,6 +32,6 @@ int main(int argc, char **argv) {
assert(15 == n); assert(15 == n);
Priority_Queue_Free(pq); Priority_Queue_Free(pq);
printf("PASS!"); printf("PASS!\n");
return 0; return 0;
} }

@ -53,7 +53,7 @@ int main(int argc, char **argv) {
assert (rc == 0); assert (rc == 0);
Vector_Free(v); Vector_Free(v);
printf("PASS!"); printf("PASS!\n");
return 0; return 0;
//Vector_Push(v, "hello"); //Vector_Push(v, "hello");

@ -6,7 +6,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
#include <redismodule.h>
#include "util.h" #include "util.h"
/** /**

Loading…
Cancel
Save