upgrade to most recent version of pl-os

fix some warnings.
This commit is contained in:
Costa Vitor 2009-06-01 17:30:08 -05:00
parent edfcfe9ddc
commit 9d5a049c8f
5 changed files with 136 additions and 638 deletions

View File

@ -374,6 +374,7 @@ PL_EXPORT(int) Sseek64(IOSTREAM *s, int64_t pos, int whence);
PL_EXPORT(int) ScheckBOM(IOSTREAM *s); PL_EXPORT(int) ScheckBOM(IOSTREAM *s);
PL_EXPORT(int) SwriteBOM(IOSTREAM *s); PL_EXPORT(int) SwriteBOM(IOSTREAM *s);
PL_EXPORT(ssize_t) Sread_user(void *handle, char *buf, size_t size);
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -2827,7 +2827,7 @@ ok:
return TRUE; return TRUE;
} }
int static int
pl_seen(void) pl_seen(void)
{ GET_LD { GET_LD
IOSTREAM *s = getStream(Scurin); IOSTREAM *s = getStream(Scurin);

View File

@ -475,6 +475,9 @@ extern int get_atom_text(atom_t atom, PL_chars_t *text);
extern int get_string_text(word w, PL_chars_t *text); extern int get_string_text(word w, PL_chars_t *text);
extern char *format_float(double f, char *buf, const char *format); extern char *format_float(double f, char *buf, const char *format);
/**** stuff from pl-ctype.c ****/
extern IOENC initEncoding(void);
/**** stuff from pl-error.c ****/ /**** stuff from pl-error.c ****/
extern int PL_get_bool_ex(term_t t, int *i); extern int PL_get_bool_ex(term_t t, int *i);
extern int PL_get_nchars_ex(term_t t, size_t *len, char **s, unsigned int flags); extern int PL_get_nchars_ex(term_t t, size_t *len, char **s, unsigned int flags);
@ -506,6 +509,7 @@ extern bool readLine(IOSTREAM *in, IOSTREAM *out, char *buffer);
extern bool tellString(char **s, size_t *size, IOENC enc); extern bool tellString(char **s, size_t *size, IOENC enc);
extern bool tellString(char **s, size_t *size, IOENC enc); extern bool tellString(char **s, size_t *size, IOENC enc);
extern bool toldString(void); extern bool toldString(void);
ssize_t Sread_user(void *handle, char *buf, size_t size);
extern int setupOutputRedirect(term_t to, redir_context *ctx, int redir); extern int setupOutputRedirect(term_t to, redir_context *ctx, int redir);
extern void discardOutputRedirect(redir_context *ctx); extern void discardOutputRedirect(redir_context *ctx);
@ -553,6 +557,18 @@ extern void RemoveTemporaryFiles(void);
extern int Pause(real t); extern int Pause(real t);
char *findExecutable(const char *av0, char *buffer); char *findExecutable(const char *av0, char *buffer);
void setOSPrologFlags(void);
void setRandom(unsigned int *seedp);
char *canoniseFileName(char *path);
char *canonisePath(char *path);
void PL_changed_cwd(void);
struct tm *LocalTime(long *t, struct tm *r);
size_t getenv3(const char *name, char *buf, size_t len);
int Setenv(char *name, char *value);
int Unsetenv(char *name);
int System(char *cmd);
bool expandVars(const char *pattern, char *expanded, int maxlen);
/**** SWI stuff (emulated in pl-yap.c) ****/ /**** SWI stuff (emulated in pl-yap.c) ****/
extern int writeAtomToStream(IOSTREAM *so, atom_t at); extern int writeAtomToStream(IOSTREAM *so, atom_t at);
extern int valueExpression(term_t t, Number r ARG_LD); extern int valueExpression(term_t t, Number r ARG_LD);

File diff suppressed because it is too large Load Diff

View File

@ -112,7 +112,7 @@ int
PL_write_term(IOSTREAM *s, term_t term, int precedence, int flags) PL_write_term(IOSTREAM *s, term_t term, int precedence, int flags)
{ {
YAP_Write(YAP_GetFromSlot(term), Sputc, flags); YAP_Write(YAP_GetFromSlot(term), (void (*)(int))Sputc, flags);
return TRUE; return TRUE;
} }
@ -120,7 +120,7 @@ int
writeAtomToStream(IOSTREAM *so, atom_t at) writeAtomToStream(IOSTREAM *so, atom_t at)
{ {
YAP_Write(YAP_MkAtomTerm((YAP_Atom)at), Sputc, 0); YAP_Write(YAP_MkAtomTerm((YAP_Atom)at), (void (*)(int))Sputc, 0);
return TRUE; return TRUE;
} }
@ -195,7 +195,7 @@ switch(n->type)
int int
_PL_unify_atomic(term_t t, PL_atomic_t a) _PL_unify_atomic(term_t t, PL_atomic_t a)
{ {
return YAP_Unify(Yap_GetFromSlot(t), (YAP_Term)a); return YAP_Unify(YAP_GetFromSlot(t), (YAP_Term)a);
} }
word lookupAtom(const char *s, size_t len) word lookupAtom(const char *s, size_t len)