Commit 58c789a2 authored by gates's avatar gates
Browse files

Don't place '..' in header inclusions and place system headers in sources that includes macro.h

parent 34e50058
......@@ -4,8 +4,10 @@
#include "configfile.h"
#include "file.h"
#include "../util/macro.h"
#include "../util/logging.h"
#include "util/macro.h"
#include "util/logging.h"
#include <stdio.h>
uint8_t *configfile_record(CONFIGFILE *kf, enum configfile_types type, uint16_t *entries, size_t *entry_len)
{
......
......@@ -3,9 +3,10 @@
#endif
#include "file.h"
#include "../util/macro.h"
#include "../util/logging.h"
#include "util/macro.h"
#include "util/logging.h"
#include <stdio.h>
#include <stdlib.h>
FILE_H *file_open_linux(const char* filename, const char *mode);
......
......@@ -6,9 +6,9 @@
#include "crypto.h"
#include "mmc.h"
#include "mkb.h"
#include "../util/macro.h"
#include "../util/logging.h"
#include "../file/file.h"
#include "util/macro.h"
#include "util/logging.h"
#include "file/file.h"
#include <inttypes.h>
#include <string.h>
......
......@@ -5,7 +5,7 @@
#ifndef AACS_H_
#define AACS_H_
#include "../file/configfile.h"
#include "file/configfile.h"
#define LIBAACS_VERSION "1.0"
......
......@@ -3,9 +3,11 @@
#endif
#include "mkb.h"
#include "../file/file.h"
#include "../util/macro.h"
#include "../util/logging.h"
#include "file/file.h"
#include "util/macro.h"
#include "util/logging.h"
#include <stdio.h>
uint8_t *_record(MKB *mkb, uint8_t type, size_t *rec_len)
{
......
......@@ -4,9 +4,9 @@
#include "mmc.h"
#include "crypto.h"
#include "../file/file.h"
#include "../util/macro.h"
#include "../util/logging.h"
#include "file/file.h"
#include "util/macro.h"
#include "util/logging.h"
#include <stdlib.h>
#include <mntent.h>
......
......@@ -3,6 +3,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
char out[512];
debug_mask_t debug_mask = 0;
......
......@@ -2,8 +2,6 @@
#ifndef MACRO_H_
#define MACRO_H_
#include <stdio.h>
#define HEX_PRINT(X,Y) { int zz; for(zz = 0; zz < Y; zz++) fprintf(stderr, "%02X", X[zz]); fprintf(stderr, "\n"); }
#define MKINT_BE16(X) ( (X)[0] << 8 | (X)[1] )
#define MKINT_BE24(X) ( (X)[0] << 16 | (X)[1] << 8 | (X)[2] )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment