DiskTool - Fixing build errors from recent kernel changes

diff --git a/KernelLand/Kernel/drv/proc.c b/KernelLand/Kernel/drv/proc.c
index cbf2565..b4483b0 100644 (file)
--- a/KernelLand/Kernel/drv/proc.c
+++ b/KernelLand/Kernel/drv/proc.c
@@ -110,7 +110,7 @@ tSysFS_Ent  *gSysFS_FileList;
 int SysFS_Install(char **Options)
 {
        gSysFS_Version_Kernel.Node.Size = strlen(gsBuildInfo);
-       gSysFS_Version_Kernel.Node.ImplPtr = gsBuildInfo;
+       gSysFS_Version_Kernel.Node.ImplPtr = (void*)gsBuildInfo;
 
        DevFS_AddDevice( &gSysFS_DriverInfo );
        return MODULE_ERR_OK;

diff --git a/Tools/DiskTool/src/Makefile b/Tools/DiskTool/src/Makefile
index a1282ac..e91bc7f 100644 (file)
--- a/Tools/DiskTool/src/Makefile
+++ b/Tools/DiskTool/src/Makefile
@@ -93,6 +93,7 @@ $(BUILDINFO_SRC): $(filter-out $(BUILDINFO_OBJ), $(OBJ)) Makefile
        @echo "const char gsKernelVersion[] = \"$(ACESS_VERSION)\";" >> $@
        @echo "const char gsGitHash[] = \""`git log -n 1 | head -n 1 | awk '{print $$2}'`"\";" >> $@
        @echo "const int giBuildNumber = $(BUILD_NUM);" >> $@
+       @echo "const char gsBuildInfo[] = \"Acess2 DiskTool v$(ACESS_VERSION)\";" >> $@
 $(BUILDINFO_OBJ): $(BUILDINFO_SRC)
        @echo [CC] -o $@
        @$(CC) -o $@ -c $< $(CFLAGS) $(CPPFLAGS)

diff --git a/Tools/DiskTool/src/include/acess.h b/Tools/DiskTool/src/include/acess.h
index 16009a4..6b74dfc 100644 (file)
--- a/Tools/DiskTool/src/include/acess.h
+++ b/Tools/DiskTool/src/include/acess.h
@@ -18,6 +18,7 @@
 extern char    __buildnum[];
 #define BUILD_NUM      ((int)(Uint)&__buildnum)
 extern const char gsGitHash[];
+extern const char gsBuildInfo[];
 
 #define BITS   32
 #define NULL   ((void*)0)