Commit 6210eb05 authored by Cedric Roux's avatar Cedric Roux

bugfix: fix ue_ip.ko compilation

Not sure that the use of __KERNEL__ is the correct solution.
To be checked at some point.

After this commit, the following works:
./build_oai --UE -c
parent 68683293
...@@ -2297,7 +2297,7 @@ add_custom_command ( ...@@ -2297,7 +2297,7 @@ add_custom_command (
# retrieve the compiler options to send it to gccxml # retrieve the compiler options to send it to gccxml
get_directory_property(DirDefs COMPILE_DEFINITIONS ) get_directory_property(DirDefs COMPILE_DEFINITIONS )
foreach( d ${DirDefs} ) foreach( d ${DirDefs} )
set(module_cc_opt_tmp "${module_cc_opt_tmp} -D${d}") set(module_cc_opt "${module_cc_opt} -D${d}")
endforeach() endforeach()
get_directory_property( DirDefs INCLUDE_DIRECTORIES ) get_directory_property( DirDefs INCLUDE_DIRECTORIES )
foreach( d ${DirDefs} ) foreach( d ${DirDefs} )
......
...@@ -27,7 +27,18 @@ ...@@ -27,7 +27,18 @@
#ifndef _ITTI_TYPES_H_ #ifndef _ITTI_TYPES_H_
#define _ITTI_TYPES_H_ #define _ITTI_TYPES_H_
#include <stdint.h> /* The current file is included in the ue_ip.ko compilation.
* For it to work we need to include linux/types.h and
* not stdint.h.
* A solution to this problem is to use #ifndef __KERNEL__.
* Maybe a better solution would be to clean things up
* so that ue_ip.ko does not include the current file.
*/
#ifndef __KERNEL__
# include <stdint.h>
#else
# include <linux/types.h>
#endif
#define CHARS_TO_UINT32(c1, c2, c3, c4) (((c4) << 24) | ((c3) << 16) | ((c2) << 8) | (c1)) #define CHARS_TO_UINT32(c1, c2, c3, c4) (((c4) << 24) | ((c3) << 16) | ((c2) << 8) | (c1))
......
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