dslinux/user/pixil/libs/pim Makefile nxapp.cxx nxdb.cxx

amadeus dslinux_amadeus at user.in-berlin.de
Sat Oct 7 22:33:43 CEST 2006


Update of /cvsroot/dslinux/dslinux/user/pixil/libs/pim
In directory antilope:/tmp/cvs-serv4052/user/pixil/libs/pim

Modified Files:
	Makefile nxapp.cxx nxdb.cxx 
Log Message:
start pixil integration in DSLINUX

Index: nxapp.cxx
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/libs/pim/nxapp.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nxapp.cxx	3 Oct 2006 11:25:26 -0000	1.1
+++ nxapp.cxx	7 Oct 2006 20:33:41 -0000	1.2
@@ -1282,7 +1282,7 @@
 
 			    if (false == err) {
 				int f_pos = 0;
-				char c;
+				int c;
 
 				memset(file_buf, 0, file_size);
 

Index: Makefile
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/libs/pim/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	3 Oct 2006 11:25:25 -0000	1.1
+++ Makefile	7 Oct 2006 20:33:41 -0000	1.2
@@ -1,7 +1,11 @@
 # libs/pim/Makefile
 
 LIB_STATIC=libpixil-pim.a
+ifeq ($(EN_SHARED),--enable-shared)
 LIB_SHARED=libpixil-pim.so
+else
+LIB_SHARED=
+endif
 
 CSRC=${shell ls *.c} 
 CXXSRC=${shell ls *.cxx}

Index: nxdb.cxx
===================================================================
RCS file: /cvsroot/dslinux/dslinux/user/pixil/libs/pim/nxdb.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nxdb.cxx	3 Oct 2006 11:25:26 -0000	1.1
+++ nxdb.cxx	7 Oct 2006 20:33:41 -0000	1.2
@@ -187,10 +187,7 @@
     fildes *_dbDesc = dbDesc[dbNumber];
     dbclose(_dbDesc);
 
-#ifdef WIN32
     return (0);
-
-#endif /*  */
 }
 
 void




More information about the dslinux-commit mailing list