raw: Add include/ folder.

Move common header files to include/ folder.

diff --git a/src/raw/Makefile b/src/raw/Makefile
index 7454f60..3ef0348 100644 (file)
--- a/src/raw/Makefile
+++ b/src/raw/Makefile
@@ -1,3 +1,4 @@
+CPPFLAGS = -I. -Iinclude
 CFLAGS = -Wall -g
 
 .PHONY: all clean
@@ -6,9 +7,9 @@ all: swift_raw_simple_test
 
 swift_raw_simple_test: swift_raw_simple_test.o swift_raw.o swift_list.o
 
-swift_raw_simple_test.o: swift_raw_simple_test.c swift_raw.h util.h
+swift_raw_simple_test.o: swift_raw_simple_test.c include/swift_raw.h include/util.h
 
-swift_raw.o: swift_raw.c swift_raw.h
+swift_raw.o: swift_raw.c swift_list.h include/swift_raw.h include/debug.h include/util.h
 
 swift_list.o: swift_list.c swift_list.h
 

diff --git a/src/raw/test/debug.h b/src/raw/include/debug.h
similarity index 100%
rename from src/raw/test/debug.h
rename to src/raw/include/debug.h

diff --git a/src/raw/swift_raw.h b/src/raw/include/swift_raw.h
similarity index 100%
rename from src/raw/swift_raw.h
rename to src/raw/include/swift_raw.h

diff --git a/src/raw/swift_types.h b/src/raw/include/swift_types.h
similarity index 100%
rename from src/raw/swift_types.h
rename to src/raw/include/swift_types.h

diff --git a/src/raw/test/util.h b/src/raw/include/util.h
similarity index 100%
rename from src/raw/test/util.h
rename to src/raw/include/util.h

diff --git a/src/raw/test/Makefile b/src/raw/test/Makefile
index 03657b0..f24b39c 100644 (file)
--- a/src/raw/test/Makefile
+++ b/src/raw/test/Makefile
@@ -1,4 +1,5 @@
-#CPPFLAGS = -DDEBUG -DLOG_LEVEL=LOG_DEBUG
+#CPPFLAGS = -DDEBUG -DLOG_LEVEL=LOG_DEBUG -I. -I.. -I../include
+CPPFLAGS = -I. -I.. -I../include
 CFLAGS = -Wall -g
 
 .PHONY: all clean

diff --git a/src/raw/util.h b/src/raw/util.h
deleted file mode 100644 (file)
index 776715a..0000000
--- a/src/raw/util.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * useful structures/macros
- *
- * 2011, Operating Systems
- */
-
-#ifndef UTIL_H_
-#define UTIL_H_                1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#if defined (_WIN32)
-
-#include <windows.h>
-
-static VOID PrintLastError(const PCHAR message)
-{
-       CHAR errBuff[1024];
-
-       FormatMessage(
-                       FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_MAX_WIDTH_MASK,
-                       NULL,
-                       GetLastError(),
-                       0,
-                       errBuff,
-                       sizeof(errBuff) - 1,
-                       NULL);
-
-       fprintf(stderr, "%s: %s\n", message, errBuff);
-}
-
-#define ERR(call_description)                                  \
-       do {                                                    \
-               fprintf(stderr, "(%s, %d): ",                   \
-                               __FILE__, __LINE__);            \
-                       PrintLastError(call_description);       \
-       } while (0)
-
-#elif defined (__linux__)
-
-/* error printing macro */
-#define ERR(call_description)                          \
-       do {                                            \
-               fprintf(stderr, "(%s, %d): ",           \
-                               __FILE__, __LINE__);    \
-                       perror(call_description);       \
-       } while (0)
-
-#else
-  #error "Unknown platform"
-#endif
-
-/* print error (call ERR) and exit */
-#define DIE(assertion, call_description)               \
-       do {                                            \
-               if (assertion) {                        \
-                       ERR(call_description);          \
-                       exit(EXIT_FAILURE);             \
-               }                                       \
-       } while(0)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif