C headers: use only file name for header define

Signed-off-by: Federico Vaga <federico.vaga@cern.ch> Signed-off-by: Dimitris Lampridis <dimitris.lampridis@cern.ch>

C headers: use only file name for header define
Signed-off-by: Federico Vaga <federico.vaga@cern.ch> Signed-off-by: Dimitris Lampridis <dimitris.lampridis@cern.ch>
9acf1cd6 · Federico Vaga · Dimitris Lampridis · 53807e02 · 9acf1cd6 · 9acf1cd6
Commit 9acf1cd6 authored Mar 20, 2018 by Federico Vaga Committed by Dimitris Lampridis Apr 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

cgen_c_headers.lua cgen_c_headers.lua +2 -2

wbgen2 wbgen2 +2 -2

No files found.
--- a/cgen_c_headers.lua
+++ b/cgen_c_headers.lua
@@ -97,8 +97,8 @@ function cgen_c_fileheader()
   emit ("");
   emit ("*/");
   emit("");
-   emit("#ifndef __WBGEN2_REGDEFS_"..string.upper(string.gsub(input_wb_file,"%.","_")))
-   emit("#define __WBGEN2_REGDEFS_"..string.upper(string.gsub(input_wb_file,"%.","_")))
+   emit("#ifndef __WBGEN2_REGDEFS_"..string.upper(string.gsub(string.gsub(input_wb_file,"(.*/)(.*)", "%2"), "%.", "_")));
+   emit("#define __WBGEN2_REGDEFS_"..string.upper(string.gsub(string.gsub(input_wb_file,"(.*/)(.*)", "%2"), "%.", "_")));
   emit("");
   emit("#ifdef __KERNEL__")
   emit("#include <linux/types.h>")

--- a/wbgen2
+++ b/wbgen2
@@ -1879,8 +1879,8 @@ emit("    DO NOT HAND-EDIT UNLESS IT'S ABSOLUTELY NECESSARY!");
 emit("");
 emit("*/");
 emit("");
-emit("#ifndef __WBGEN2_REGDEFS_"..string.upper(string.gsub(input_wb_file,"%.","_")))
-emit("#define __WBGEN2_REGDEFS_"..string.upper(string.gsub(input_wb_file,"%.","_")))
+emit("#ifndef __WBGEN2_REGDEFS_"..string.upper(string.gsub(string.gsub(input_wb_file,"(.*/)(.*)","%2"),"%.","_")));
+emit("#define __WBGEN2_REGDEFS_"..string.upper(string.gsub(string.gsub(input_wb_file,"(.*/)(.*)","%2"),"%.","_")));
 emit("");
 emit("#ifdef __KERNEL__")
 emit("#include <linux/types.h>")