e2cmdw.cpp    |    7 ++++---

 pic12bus.cpp  |    2 +-

 picbus.cpp    |    2 +-

 picbusnew.cpp |    2 +-

 ponyioint.cpp |    2 +-

 rs232int.cpp  |    2 +-

 sxbus.cpp     |    2 +-

 v/Config.mk   |   26 +++++++++++++-------------

 v/Makefile    |    2 +-

 9 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/e2cmdw.cpp b/e2cmdw.cpp

index b6a13bc..563f1d1 100644

--- a/e2cmdw.cpp

+++ b/e2cmdw.cpp

@@ -42,6 +42,7 @@

 #include <v/vkeys.h>	// to map keys

 #include <v/vprintdc.h>

 #include <v/vprinter.h>

+#include <v/vcomboc.h>

 #include <v/vcolor.h>

 #include <v/vos.h>

@@ -655,13 +656,13 @@ static vMenu StandardMenu[] =

 	static vIcon editI(&edit20x20_bits[0],edit20x20_height,edit20x20_width,edit20x20_depth);

 //@V@:EndIcons

-#define COMBOLIST_SIZE	128

+#define COMBOLIST_SIZE	MAX_COMBO_LIST

-static char* comboList1[COMBOLIST_SIZE];

+static const char* comboList1[COMBOLIST_SIZE];

 //this determines only the size of the comboBox, the content will be initialized

 //  within PostInit()

-static char* comboList2[COMBOLIST_SIZE] =

+static const char* comboList2[COMBOLIST_SIZE] =

   {

     "123456789012345",   // The first item in the list

     0            // 0 terminates the list

diff --git a/pic12bus.cpp b/pic12bus.cpp

index 9e10a45..f38e3dc 100644

--- a/pic12bus.cpp

+++ b/pic12bus.cpp

@@ -34,7 +34,7 @@

 #include "e2app.h"

 #ifdef	_LINUX_

-#  include <asm/io.h>

+//#  include <asm/io.h>

 #  include <unistd.h>

 #else

 #  ifdef	__BORLANDC__

diff --git a/picbus.cpp b/picbus.cpp

index 4ced681..ae9e9dd 100644

--- a/picbus.cpp

+++ b/picbus.cpp

@@ -34,7 +34,7 @@

 #include "e2app.h"

 #ifdef	_LINUX_

-#  include <asm/io.h>

+//#  include <asm/io.h>

 #  include <unistd.h>

 #else

 #  ifdef	__BORLANDC__

diff --git a/picbusnew.cpp b/picbusnew.cpp

index 769f886..8a70752 100644

--- a/picbusnew.cpp

+++ b/picbusnew.cpp

@@ -34,7 +34,7 @@

 #include "e2app.h"

 #ifdef	_LINUX_

-#  include <asm/io.h>

+//#  include <asm/io.h>

 #  include <unistd.h>

 #else

 #  ifdef	__BORLANDC__

diff --git a/ponyioint.cpp b/ponyioint.cpp

index 616f5c7..1adf232 100644

--- a/ponyioint.cpp

+++ b/ponyioint.cpp

@@ -57,7 +57,7 @@

 # define RF_TEST (1 << RB_TEST)

 #ifdef	_LINUX_

-# include <asm/io.h>

+//# include <asm/io.h>

 # include <unistd.h>

 #else

 # ifdef	__BORLANDC__

diff --git a/rs232int.cpp b/rs232int.cpp

index 7951cb9..81e0d7b 100644

--- a/rs232int.cpp

+++ b/rs232int.cpp

@@ -143,7 +143,7 @@ int RS232Interface::OpenSerial(int no)

 		snprintf(lockname, MAXPATH, "%s/LCK..%s%d", profile->GetLockDir(), profile->GetDevName(), no);

 		UserDebug1(UserApp2, "RS232Interface::OpenSerial() now lock the device %s\n", lockname);

-		fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT);

+		fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT,S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);

 		if (fd < 0)

 		{

 			fd = open ((const char *)lockname,O_RDONLY);

diff --git a/sxbus.cpp b/sxbus.cpp

index 77d7e76..584d3f1 100644

--- a/sxbus.cpp

+++ b/sxbus.cpp

@@ -32,7 +32,7 @@

 #include "errcode.h"

 #ifdef	_LINUX_

-#  include <asm/io.h>

+//#  include <asm/io.h>

 #  include <unistd.h>

 #else

 #  ifdef	__BORLANDC__

diff --git a/v/Config.mk b/v/Config.mk

index 530f594..093f537 100644

--- a/v/Config.mk

+++ b/v/Config.mk

@@ -20,8 +20,8 @@

 #---------------------------------------------------------------------

 # Version info

 #---------------------------------------------------------------------

-VV	=	1.25

-VVW	=	125

+VV	=	1.90

+VVW	=	190

 #---------------------------------------------------------------------

@@ -29,9 +29,9 @@ VVW	=	125

 #---------------------------------------------------------------------

 #HOMEV	=	$(HOME)/v

 #HOMEV	=	..

-HOMEV	=	$(HOME)/Progetti/PonyProg_Sourceforge/software/v

+HOMEV	=	/tmp

-LINUX_HEADERS	=	/usr/src/linux-headers-2.6.22-14-generic/include

+LINUX_HEADERS	=	/usr/include/linux-default/include

 INSTALL_PREFIX	=	/usr/local

@@ -40,13 +40,13 @@ INSTALL_PREFIX	=	/usr/local

 #---------------------------------------------------------------------

 #CC	=	gcc

 #CXX	=	g++

-CC	=	gcc-3.4

-CXX	=	g++-3.4

+CC	=	gcc

+CXX	=	g++

 #---------------------------------------------------------------------

 # VPATH for dependencies on header files

 #---------------------------------------------------------------------

-VPATH=$(HOMEV)/includex/v

+VPATH=/usr/include/v

 #---------------------------------------------------------------------

@@ -107,8 +107,8 @@ DEBUG	= no

 #---------------------------------------------------------------------

 # Select Develop or not - used for original development

 #---------------------------------------------------------------------

-#DEVEL	=	yes

 DEVEL	= no

+#DEVEL	= no

 #---------------------------------------------------------------------

 # Define filename extensions that are targeted by cleanup's

@@ -119,21 +119,21 @@ CLEANEXTS= *.bak *~ *.tmp core *.o *.obj

 #---------------------------------------------------------------------

 # Architecture dependent directory locations

 #---------------------------------------------------------------------

-VLibDir	=	$(HOMEV)/lib

+VLibDir	=	/usr/lib

 ifeq ($(TOOLKIT),Motif)

 oDir	=	$(HOMEV)/obj

 endif

 ifeq ($(TOOLKIT),Athena)

-oDir	=	$(HOMEV)/objx

+oDir	=	/tmp

 endif

-LibDir	=	$(HOMEV)/lib

-Bin	=	$(HOMEV)/bin

+LibDir	=	/usr/lib

+Bin	=	/usr/bin

 #---------------------------------------------------------------------

 # Architecture independent 

 #---------------------------------------------------------------------

-INCDIR	=	-I$(HOMEV)/includex

+INCDIR	=	-I/usr/include

 LIBDIR	=	-L$(LibDir)

 ifeq ($(TOOLKIT),Athena)

 	LIBNAME	= libVx

diff --git a/v/Makefile b/v/Makefile

index a58483b..a94a602 100644

--- a/v/Makefile

+++ b/v/Makefile

@@ -84,7 +84,7 @@ default: vlib

 all:	vlib vtest utils examples

 	@echo "Library, test, utils, examples and tutorial made"

-vlib: srcx

+vlib:

 vtest: test