--- a/Renderer/Engine/lindaapi.h	Tue May 25 19:14:44 2010 +0900
+++ b/Renderer/Engine/lindaapi.h	Wed Jun 02 01:39:15 2010 +0900
@@ -1,13 +1,3 @@
-#ifndef _LINDAAPI_H
-
-#define _LINDAAPI_H 1
-
-#include "types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*  $Id$ */
 
 /*----------------------------------------------------------------------
@@ -62,24 +52,24 @@
 ----------------------------------------------------------------------*/
 
 extern void init_linda(void);
-extern int open_linda(const char *hostname, int port);
-extern int open_linda_java(const char *hostname, int port);
+extern int open_linda(char *hostname, int port);
+extern int open_linda_java(char *hostname, int port);
 extern int close_linda(int tspace_id);
 
 extern void psx_free(void*);
 
 extern unsigned char *psx_reply(unsigned int seq);
 extern void psx_sync_n(void);
+extern void psx_sync_n_timeout(int time);
 extern unsigned int psx_get_datalength(unsigned char *);
-extern unsigned char *psx_get_data(unsigned char *);
 extern unsigned int psx_get_seq(unsigned char *);
 extern unsigned short psx_get_id(unsigned char *);
 extern unsigned char psx_get_mode(unsigned char *);
 extern unsigned char * psx_get_data(unsigned char *);
 
-extern long psx_out(unsigned int tspace_id, unsigned int id,
+extern int psx_out(unsigned int tspace_id, unsigned int id,
                    unsigned char *data, unsigned int size);
-extern long psx_ld(unsigned int tspace_id, unsigned int id,
+extern int psx_ld(unsigned int tspace_id, unsigned int id,
                   char mode, void(*callback)(unsigned char *,void *),void * obj);
 
 #define psx_in(tid, id)      psx_ld(tid, id, 'i', NULL, NULL)
@@ -92,9 +82,3 @@
 #define psx_callback_ck(tid, id,callback,obj)      psx_ld(tid, id, 'c', callback, obj)
 #define psx_callback_wait_rd(tid, id,callback,obj) psx_ld(tid, id, 'w', callback, obj)
 
-
-
-#ifdef __cplusplus
-};  // for extern "C"
-#endif
-#endif // _LINDAAPI_H