Skip to content

Commit

Permalink
Merge pull request mirage#61 from hannesm/fix-4.08+
Browse files Browse the repository at this point in the history
configure: fix 4.08+ case; support >= 4.08.1+rc3
  • Loading branch information
mato authored Aug 5, 2019
2 parents 4bccca8 + 7857bfb commit 2c8fb51
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ case $(ocamlopt -version) in
echo '#define INT64_LITERAL(s) s ## LL' >> config/m.${BUILD_ARCH}.h
echo 'SYSTEM=freestanding' >> config/Makefile.${BUILD_OS}.${BUILD_ARCH}
;;
4.08.[0-9]|4.07.[0-9]+*)
4.08.[0-9]|4.08.[0-9]+*)
OCAML_GTE_4_06_0=yes
OCAML_GTE_4_07_0=yes
OCAML_GTE_4_08_0=yes
Expand Down
4 changes: 4 additions & 0 deletions nolibc/include/sys/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@
#include <stddef.h>
#include <stdint.h>

typedef int pid_t;
typedef int off_t;
typedef int ssize_t;

#endif
5 changes: 2 additions & 3 deletions nolibc/include/unistd.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
#ifndef _UNISTD_H
#define _UNISTD_H

#include <sys/types.h>

int chdir(const char *);
int close(int);
char *getcwd(char *, size_t);
typedef int pid_t;
pid_t getpid(void);
pid_t getppid(void);
int isatty(int);
typedef int off_t;
off_t lseek(int, off_t, int); /* SEEK_ */
typedef int ssize_t;
ssize_t read(int, void *, size_t);
ssize_t write(int, const void *, size_t);
ssize_t readlink(const char *, char *, size_t);
Expand Down

0 comments on commit 2c8fb51

Please sign in to comment.