Changeset 651 for trunk/zoo-project/zoo-kernel

Timestamp:

Jun 4, 2015, 4:09:20 PM (10 years ago)

Author:

david

Message:

Bug Fix linux compilation

Location:

trunk/zoo-project/zoo-kernel

Files:

• ZOOMakefile.opts.in (modified) (2 diffs)
• response_print.c (modified) (1 diff)
• service_internal.c (modified) (1 diff)
• sqlapi.c (modified) (1 diff)

trunk/zoo-project/zoo-kernel/ZOOMakefile.opts.in

@@ -62 +62 @@
 
 ZOO_CFLAGS=-I${ZRPATH}/../thirds/cgic206/ -I${ZRPATH}/zoo-kernel/
-ZOO_LDFLAGS=-lcrypto
+ZOO_LDFLAGS=-lcrypto -luuid
 
 JAVACFLAGS=@JAVA_CPPFLAGS@
@@ -91 +91 @@
 
 CFLAGS=@DEB_DEF@ -fpic ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
-LDFLAGS=-lzoo_service -lcurl -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS}
+LDFLAGS=-lzoo_service -lcurl -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto -luuid ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS}
 

trunk/zoo-project/zoo-kernel/response_print.c

@@ -26 +26 @@
 #include "request_parser.h"
 #include "server_internal.h"
+#include "service_internal.h"
 #ifdef USE_MS
 #include "service_internal_ms.h"

trunk/zoo-project/zoo-kernel/service_internal.c

@@ -619 +619 @@
 char *readVSIFile(maps* conf,const char* dataSource){
     VSILFILE * fichier=VSIFOpenL(dataSource,"rb");
-    VSIStatBufL file_status;
-    VSIStatL(dataSource, &file_status);
+    VSIStatBuf file_status;
+    VSIStat(dataSource, &file_status);
     if(fichier==NULL){
       char tmp[1024];

trunk/zoo-project/zoo-kernel/sqlapi.c

@@ -39 +39 @@
   uuid_t uuid;
   uuid_generate_time(uuid);
-  uuid_string_t rest;
+  char * rest;
   uuid_unparse(uuid,rest);
   sprintf(res,"%s", rest);