From b480cb3d4793f84acadb86110ed550f3d0b8982f Mon Sep 17 00:00:00 2001 From: lighta Date: Wed, 21 Oct 2015 01:16:01 -0400 Subject: [PATCH] Valkyrie example Move valkyrie sample config into conf/ Change path for relative path so that it could be applied for all. tested with : 'valkyrie -f valkyrie_sample.cfg' Change include in common, true that complicate move for those file but will facilitate the parsing for some ide. --- .gitignore | 3 ++- ragit.cfg => conf/valkyrie_sample.cfg | 12 ++++++------ serv.bat | 2 +- src/common/atomic.h | 4 ++-- src/common/conf.c | 2 +- src/common/conf.h | 2 +- src/common/core.c | 2 +- src/common/db.c | 10 +++++----- src/common/db.h | 2 +- src/common/des.c | 4 ++-- src/common/ers.c | 10 +++++----- src/common/ers.h | 2 +- src/common/evdp.h | 2 +- src/common/grfio.c | 12 ++++++------ src/common/malloc.c | 6 +++--- src/common/malloc.h | 2 +- src/common/mapindex.c | 10 +++++----- src/common/mempool.c | 16 ++++++++-------- src/common/mempool.h | 2 +- src/common/mmo.h | 2 +- src/common/mutex.c | 12 ++++++------ src/common/netbuffer.h | 2 +- src/common/network.h | 6 +++--- src/common/nullpo.c | 2 +- src/common/nullpo.h | 2 +- src/common/raconf.c | 10 +++++----- src/common/raconf.h | 2 +- src/common/random.c | 6 +++--- src/common/random.h | 2 +- src/common/showmsg.c | 6 +++--- src/common/socket.c | 14 +++++++------- src/common/socket.h | 4 ++-- src/common/spinlock.h | 8 ++++---- src/common/sql.c | 12 ++++++------ src/common/sql.h | 2 +- src/common/strlib.c | 6 +++--- src/common/strlib.h | 2 +- src/common/thread.c | 2 +- src/common/thread.h | 2 +- src/common/timer.c | 14 +++++++------- src/common/timer.h | 2 +- src/common/utils.c | 6 +++--- src/common/utils.h | 2 +- 43 files changed, 117 insertions(+), 116 deletions(-) rename ragit.cfg => conf/valkyrie_sample.cfg (80%) diff --git a/.gitignore b/.gitignore index 8b7596deb3..22064ab333 100644 --- a/.gitignore +++ b/.gitignore @@ -134,4 +134,5 @@ Thumbs.db /.idea/rathena.iml /.idea/vcs.xml /.idea/workspace.xml -/build/ \ No newline at end of file +/build/ + diff --git a/ragit.cfg b/conf/valkyrie_sample.cfg similarity index 80% rename from ragit.cfg rename to conf/valkyrie_sample.cfg index 54f9798e97..0fe8a9d4f0 100644 --- a/ragit.cfg +++ b/conf/valkyrie_sample.cfg @@ -40,19 +40,19 @@ xml=yes xml-user-comment= [valkyrie] -binary=/home/lighta/Documents/Myscript/RO/Servs/ragit/char-server +binary=./char-server binary-flags=--run-once browser=/usr/bin/perl -default-logdir=/tmp/valkyrie_lighta/ +default-logdir=./tmp font-gen-sys=true font-gen-user="Luxi Sans,10,-1,5,50,0,0,0,0,0" font-tool-user="Misc Fixed,11,-1,5,50,0,0,0,0,0" -project-file= +project-file=/home/lighta/Documents/Dev/RO/rathena/conf/valkyrie_sample.cfg show-butt-text=false show-tooltips=true -src-editor=gvim +src-editor=/bin/geany src-lines=2 use-vk-palette=true -vg-exec=valgrind +vg-exec=/bin/valgrind view-log= -working-dir=/home/lighta/Documents/Myscript/RO/Servs/ragit +working-dir=../ diff --git a/serv.bat b/serv.bat index 6e8037faa2..77000c66ed 100755 --- a/serv.bat +++ b/serv.bat @@ -48,7 +48,7 @@ GOTO RESTART_NT :DIRECT ECHO Do not run this file directly. It is used by logserv.bat, charserv.bat, -ECHO mapserv.bat and their '-sql' counterparts. +ECHO mapserv.bat and their '-server' counterparts. GOTO END :NOTFOUND diff --git a/src/common/atomic.h b/src/common/atomic.h index a90ecc1d6b..73852c9639 100644 --- a/src/common/atomic.h +++ b/src/common/atomic.h @@ -14,10 +14,10 @@ // // our Abstraction is fully API-Compatible to Microsofts implementation @ NT5.0+ // -#include "../common/cbasetypes.h" +#include "cbasetypes.h" #if defined(_MSC_VER) -#include "../common/winapi.h" +#include "winapi.h" // This checks if C/C++ Compiler Version is 18.00 #if _MSC_VER < 1800 diff --git a/src/common/conf.c b/src/common/conf.c index 7650a13fdd..94a649ecc5 100644 --- a/src/common/conf.c +++ b/src/common/conf.c @@ -2,7 +2,7 @@ // For more information, see LICENCE in the main folder #include "conf.h" -#include "../common/showmsg.h" // ShowError +#include "showmsg.h" // ShowError int conf_read_file(config_t *config, const char *config_filename) { diff --git a/src/common/conf.h b/src/common/conf.h index d223505dba..8570f38d31 100644 --- a/src/common/conf.h +++ b/src/common/conf.h @@ -4,7 +4,7 @@ #ifndef _CONF_H_ #define _CONF_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" #include "../../3rdparty/libconfig/libconfig.h" int conf_read_file(config_t *config, const char *config_filename); diff --git a/src/common/core.c b/src/common/core.c index 675678ea4c..8259efc88a 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -19,7 +19,7 @@ #ifndef _WIN32 #include #else -#include "../common/winapi.h" // Console close event handling +#include "winapi.h" // Console close event handling #include // _chdir #endif diff --git a/src/common/db.c b/src/common/db.c index 5627db1b6b..d1b25d0160 100644 --- a/src/common/db.c +++ b/src/common/db.c @@ -70,11 +70,11 @@ #include "db.h" -#include "../common/ers.h" -#include "../common/malloc.h" -#include "../common/mmo.h" -#include "../common/showmsg.h" -#include "../common/strlib.h" +#include "ers.h" +#include "malloc.h" +#include "mmo.h" +#include "showmsg.h" +#include "strlib.h" #include #include diff --git a/src/common/db.h b/src/common/db.h index 28e9438b53..6a985dedbc 100644 --- a/src/common/db.h +++ b/src/common/db.h @@ -42,7 +42,7 @@ #ifndef _DB_H_ #define _DB_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" #include diff --git a/src/common/des.c b/src/common/des.c index 917fc33e0d..ee45731e79 100644 --- a/src/common/des.c +++ b/src/common/des.c @@ -1,7 +1,7 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "../common/cbasetypes.h" -#include "../common/des.h" +#include "cbasetypes.h" +#include "des.h" /// DES (Data Encryption Standard) algorithm, modified version. diff --git a/src/common/ers.c b/src/common/ers.c index 04c260a6a3..8903a57934 100644 --- a/src/common/ers.c +++ b/src/common/ers.c @@ -40,12 +40,12 @@ * @see common#ers.h * \*****************************************************************************/ -#include "ers.h" -#include "../common/cbasetypes.h" -#include "../common/malloc.h" // CREATE, RECREATE, aMalloc, aFree -#include "../common/nullpo.h" -#include "../common/showmsg.h" // ShowMessage, ShowError, ShowFatalError, CL_BOLD, CL_NORMAL +#include "cbasetypes.h" +#include "ers.h" +#include "malloc.h" // CREATE, RECREATE, aMalloc, aFree +#include "nullpo.h" +#include "showmsg.h" // ShowMessage, ShowError, ShowFatalError, CL_BOLD, CL_NORMAL #include #include diff --git a/src/common/ers.h b/src/common/ers.h index e9dbae946e..d4bc71ac23 100644 --- a/src/common/ers.h +++ b/src/common/ers.h @@ -40,7 +40,7 @@ #ifndef _ERS_H_ #define _ERS_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" /*****************************************************************************\ * (1) All public parts of the Entry Reusage System. * diff --git a/src/common/evdp.h b/src/common/evdp.h index ff64d4d6b2..7767a15140 100644 --- a/src/common/evdp.h +++ b/src/common/evdp.h @@ -1,7 +1,7 @@ #ifndef _rA_EVDP_H_ #define _rA_EVDP_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" typedef struct EVDP_DATA EVDP_DATA; diff --git a/src/common/grfio.c b/src/common/grfio.c index 3c5bb72b61..a596e7d4ce 100644 --- a/src/common/grfio.c +++ b/src/common/grfio.c @@ -1,12 +1,12 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "../common/cbasetypes.h" -#include "../common/des.h" -#include "../common/malloc.h" -#include "../common/showmsg.h" -#include "../common/strlib.h" -#include "../common/utils.h" +#include "cbasetypes.h" +#include "des.h" +#include "malloc.h" +#include "showmsg.h" +#include "strlib.h" +#include "utils.h" #include "grfio.h" #include diff --git a/src/common/malloc.c b/src/common/malloc.c index 44f2eff5cd..4eb1f29c79 100644 --- a/src/common/malloc.c +++ b/src/common/malloc.c @@ -1,9 +1,9 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "../common/malloc.h" -#include "../common/core.h" -#include "../common/showmsg.h" +#include "malloc.h" +#include "core.h" +#include "showmsg.h" #include #include diff --git a/src/common/malloc.h b/src/common/malloc.h index 6b4e8e5c4b..6483af430c 100644 --- a/src/common/malloc.h +++ b/src/common/malloc.h @@ -4,7 +4,7 @@ #ifndef _MALLOC_H_ #define _MALLOC_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" #define ALC_MARK __FILE__, __LINE__, __func__ diff --git a/src/common/mapindex.c b/src/common/mapindex.c index 4f8540e87b..d55ce9d3ec 100644 --- a/src/common/mapindex.c +++ b/src/common/mapindex.c @@ -2,11 +2,11 @@ // For more information, see LICENCE in the main folder #include "../config/core.h" -#include "../common/core.h" -#include "../common/mapindex.h" -#include "../common/mmo.h" -#include "../common/showmsg.h" -#include "../common/strlib.h" +#include "core.h" +#include "mapindex.h" +#include "mmo.h" +#include "showmsg.h" +#include "strlib.h" #include diff --git a/src/common/mempool.c b/src/common/mempool.c index 12d35bd2e3..596165f7c5 100644 --- a/src/common/mempool.c +++ b/src/common/mempool.c @@ -15,18 +15,18 @@ #include #ifdef WIN32 -#include "../common/winapi.h" +#include "winapi.h" #else #include #endif -#include "../common/cbasetypes.h" -#include "../common/showmsg.h" -#include "../common/mempool.h" -#include "../common/atomic.h" -#include "../common/spinlock.h" -#include "../common/malloc.h" -#include "../common/mutex.h" +#include "cbasetypes.h" +#include "showmsg.h" +#include "mempool.h" +#include "atomic.h" +#include "spinlock.h" +#include "malloc.h" +#include "mutex.h" #define ALIGN16 ra_align(16) #define ALIGN_TO(x, a) (x + ( a - ( x % a) ) ) diff --git a/src/common/mempool.h b/src/common/mempool.h index aeaebe7fec..f6fa7438f8 100644 --- a/src/common/mempool.h +++ b/src/common/mempool.h @@ -1,7 +1,7 @@ #ifndef _rA_MEMPOOL_H_ #define _rA_MEMPOOL_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" typedef struct mempool *mempool; diff --git a/src/common/mmo.h b/src/common/mmo.h index 5773028d8f..dd5b82ab90 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -5,8 +5,8 @@ #define _MMO_H_ #include "cbasetypes.h" -#include "../common/db.h" #include "../config/core.h" +#include "db.h" #include // server->client protocol version diff --git a/src/common/mutex.c b/src/common/mutex.c index e11438e904..c62839fc34 100644 --- a/src/common/mutex.c +++ b/src/common/mutex.c @@ -2,17 +2,17 @@ // For more information, see LICENCE in the main folder #ifdef WIN32 -#include "../common/winapi.h" +#include "winapi.h" #else #include #endif -#include "../common/cbasetypes.h" -#include "../common/malloc.h" -#include "../common/showmsg.h" -#include "../common/timer.h" -#include "../common/mutex.h" +#include "cbasetypes.h" +#include "malloc.h" +#include "showmsg.h" +#include "timer.h" +#include "mutex.h" struct ramutex{ #ifdef WIN32 diff --git a/src/common/netbuffer.h b/src/common/netbuffer.h index 844241226c..236c60f222 100644 --- a/src/common/netbuffer.h +++ b/src/common/netbuffer.h @@ -4,7 +4,7 @@ #ifndef _rA_NETBUFFER_H_ #define _rA_NETBUFFER_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" typedef struct netbuf{ sysint pool; // The pool ID this buffer belongs to, diff --git a/src/common/network.h b/src/common/network.h index d7b463a2ff..18da682570 100644 --- a/src/common/network.h +++ b/src/common/network.h @@ -2,9 +2,9 @@ #define _rA_NETWORK_H_ #include -#include "../common/cbasetypes.h" -#include "../common/netbuffer.h" -#include "../common/evdp.h" +#include "cbasetypes.h" +#include "netbuffer.h" +#include "evdp.h" #ifndef MAXCONN #define MAXCONN 16384 diff --git a/src/common/nullpo.c b/src/common/nullpo.c index 6a61793ad6..8a3f1a33aa 100644 --- a/src/common/nullpo.c +++ b/src/common/nullpo.c @@ -5,7 +5,7 @@ #include #include #include "nullpo.h" -#include "../common/showmsg.h" +#include "showmsg.h" static void nullpo_info_core(const char *file, int line, const char *func, const char *fmt, va_list ap); static void nullpo_info_core_(const char *file, int line, const char *func); diff --git a/src/common/nullpo.h b/src/common/nullpo.h index 8ee86a7823..5427665f48 100644 --- a/src/common/nullpo.h +++ b/src/common/nullpo.h @@ -5,7 +5,7 @@ #define _NULLPO_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" #define NLP_MARK __FILE__, __LINE__, __func__ diff --git a/src/common/raconf.c b/src/common/raconf.c index c3aee824ff..c0d715575c 100644 --- a/src/common/raconf.c +++ b/src/common/raconf.c @@ -14,12 +14,12 @@ #include #include -#include "../common/cbasetypes.h" -#include "../common/showmsg.h" -#include "../common/db.h" -#include "../common/malloc.h" +#include "cbasetypes.h" +#include "showmsg.h" +#include "db.h" +#include "malloc.h" -#include "../common/raconf.h" +#include "raconf.h" #define SECTION_LEN 32 #define VARNAME_LEN 64 diff --git a/src/common/raconf.h b/src/common/raconf.h index 68a2b51b20..fe8af3568d 100644 --- a/src/common/raconf.h +++ b/src/common/raconf.h @@ -4,7 +4,7 @@ #ifndef _rA_CONF_H_ #define _rA_CONF_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" // rAthena generic configuration file parser // diff --git a/src/common/random.c b/src/common/random.c index ae668f1be0..bce981dd86 100644 --- a/src/common/random.c +++ b/src/common/random.c @@ -1,11 +1,11 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "../common/showmsg.h" -#include "../common/timer.h" // gettick +#include "showmsg.h" +#include "timer.h" // gettick #include "random.h" #if defined(WIN32) - #include "../common/winapi.h" + #include "winapi.h" #elif defined(HAVE_GETPID) || defined(HAVE_GETTID) #include #include diff --git a/src/common/random.h b/src/common/random.h index 43dfd36c07..8c4466132f 100644 --- a/src/common/random.h +++ b/src/common/random.h @@ -4,7 +4,7 @@ #ifndef _RANDOM_H_ #define _RANDOM_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" void rnd_init(void); void rnd_seed(uint32); diff --git a/src/common/showmsg.c b/src/common/showmsg.c index 145812d4d5..31ea115a7d 100644 --- a/src/common/showmsg.c +++ b/src/common/showmsg.c @@ -1,8 +1,8 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "../common/cbasetypes.h" -#include "../common/strlib.h" // StringBuf +#include "cbasetypes.h" +#include "strlib.h" // StringBuf #include "showmsg.h" #include "core.h" //[Ind] - For SERVER_TYPE @@ -10,7 +10,7 @@ #include // atexit #ifdef WIN32 - #include "../common/winapi.h" + #include "winapi.h" #ifdef DEBUGLOGMAP #define DEBUGLOGPATH "log\\map-server.log" diff --git a/src/common/socket.c b/src/common/socket.c index dee6c618cb..c936493561 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -1,18 +1,18 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "../common/cbasetypes.h" -#include "../common/mmo.h" -#include "../common/timer.h" -#include "../common/malloc.h" -#include "../common/showmsg.h" -#include "../common/strlib.h" +#include "cbasetypes.h" +#include "mmo.h" +#include "timer.h" +#include "malloc.h" +#include "showmsg.h" +#include "strlib.h" #include "socket.h" #include #ifdef WIN32 - #include "../common/winapi.h" + #include "winapi.h" #else #include #include diff --git a/src/common/socket.h b/src/common/socket.h index 6f7d8dd1b7..3fa62ecd23 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -4,10 +4,10 @@ #ifndef _SOCKET_H_ #define _SOCKET_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" #ifdef WIN32 - #include "../common/winapi.h" + #include "winapi.h" typedef long in_addr_t; #else #include diff --git a/src/common/spinlock.h b/src/common/spinlock.h index 3419bfdd5a..8d213541b0 100644 --- a/src/common/spinlock.h +++ b/src/common/spinlock.h @@ -16,12 +16,12 @@ // #ifdef WIN32 -#include "../common/winapi.h" +#include "winapi.h" #endif -#include "../common/cbasetypes.h" -#include "../common/atomic.h" -#include "../common/thread.h" +#include "cbasetypes.h" +#include "atomic.h" +#include "thread.h" #ifdef WIN32 diff --git a/src/common/sql.c b/src/common/sql.c index de86feb597..6533aafebc 100644 --- a/src/common/sql.c +++ b/src/common/sql.c @@ -1,15 +1,15 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "../common/cbasetypes.h" -#include "../common/malloc.h" -#include "../common/showmsg.h" -#include "../common/strlib.h" -#include "../common/timer.h" +#include "cbasetypes.h" +#include "malloc.h" +#include "showmsg.h" +#include "strlib.h" +#include "timer.h" #include "sql.h" #ifdef WIN32 -#include "../common/winapi.h" +#include "winapi.h" #endif #include #include // strtoul diff --git a/src/common/sql.h b/src/common/sql.h index a9d8c61368..07c080549e 100644 --- a/src/common/sql.h +++ b/src/common/sql.h @@ -4,7 +4,7 @@ #ifndef _COMMON_SQL_H_ #define _COMMON_SQL_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" #include // va_list diff --git a/src/common/strlib.c b/src/common/strlib.c index 0554de412c..4218fa7b9e 100644 --- a/src/common/strlib.c +++ b/src/common/strlib.c @@ -1,9 +1,9 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "../common/cbasetypes.h" -#include "../common/malloc.h" -#include "../common/showmsg.h" +#include "cbasetypes.h" +#include "malloc.h" +#include "showmsg.h" #include "strlib.h" #include diff --git a/src/common/strlib.h b/src/common/strlib.h index 8c010dbba2..f049d05ee3 100644 --- a/src/common/strlib.h +++ b/src/common/strlib.h @@ -4,7 +4,7 @@ #ifndef _STRLIB_H_ #define _STRLIB_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" #include #define __USE_GNU // required to enable strnlen on some platforms diff --git a/src/common/thread.c b/src/common/thread.c index 315b310b2a..8ee788a5bd 100644 --- a/src/common/thread.c +++ b/src/common/thread.c @@ -7,7 +7,7 @@ // For more information, see LICENCE in the main folder #ifdef WIN32 -#include "../common/winapi.h" +#include "winapi.h" #define getpagesize() 4096 // @TODO: implement this properly (GetSystemInfo .. dwPageSize..). (Atm as on all supported win platforms its 4k its static.) #define __thread __declspec( thread ) #else diff --git a/src/common/thread.h b/src/common/thread.h index a5a66e9542..79519ef5cd 100644 --- a/src/common/thread.h +++ b/src/common/thread.h @@ -5,7 +5,7 @@ #ifndef _rA_THREAD_H_ #define _rA_THREAD_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" typedef struct rAthread *rAthread; typedef void* (*rAthreadProc)(void*); diff --git a/src/common/timer.c b/src/common/timer.c index 80e609629c..99c20884c3 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -1,19 +1,19 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "../common/cbasetypes.h" -#include "../common/db.h" -#include "../common/malloc.h" -#include "../common/showmsg.h" -#include "../common/utils.h" -#include "../common/nullpo.h" +#include "cbasetypes.h" +#include "db.h" +#include "malloc.h" +#include "showmsg.h" +#include "utils.h" +#include "nullpo.h" #include "timer.h" #include #include #ifdef WIN32 -#include "../common/winapi.h" // GetTickCount() +#include "winapi.h" // GetTickCount() #else #endif diff --git a/src/common/timer.h b/src/common/timer.h index c29e7b10b3..c0200b38bc 100644 --- a/src/common/timer.h +++ b/src/common/timer.h @@ -4,7 +4,7 @@ #ifndef _TIMER_H_ #define _TIMER_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" #include #define DIFF_TICK(a,b) ((int)((a)-(b))) diff --git a/src/common/utils.c b/src/common/utils.c index 0df7855f74..132dd6323e 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -1,8 +1,8 @@ // Copyright (c) Athena Dev Teams - Licensed under GNU GPL // For more information, see LICENCE in the main folder -#include "../common/cbasetypes.h" -#include "../common/showmsg.h" +#include "cbasetypes.h" +#include "showmsg.h" #include "socket.h" #include "utils.h" @@ -11,7 +11,7 @@ #include // floor() #ifdef WIN32 - #include "../common/winapi.h" + #include "winapi.h" #ifndef F_OK #define F_OK 0x0 #endif /* F_OK */ diff --git a/src/common/utils.h b/src/common/utils.h index b8eb40fc2d..8d02714c11 100644 --- a/src/common/utils.h +++ b/src/common/utils.h @@ -4,7 +4,7 @@ #ifndef _UTILS_H_ #define _UTILS_H_ -#include "../common/cbasetypes.h" +#include "cbasetypes.h" #include // FILE* // generate a hex dump of the first 'length' bytes of 'buffer'