Skip to content

Commit

Permalink
Merge branch 'master' into per-thread-state
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmed-irfan committed Oct 6, 2023
2 parents 4b2d5ce + f2a53c5 commit 9d16834
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ runs:
using: composite
steps:
- name: Build and install libpoly
if: inputs.config-opt == '--enable-mcsat'
shell: bash
run: |
pushd .
Expand All @@ -25,6 +26,7 @@ runs:
sudo make install
popd
- name: Build and install CUDD
if: inputs.config-opt == '--enable-mcsat'
shell: bash
run: |
pushd .
Expand Down
5 changes: 5 additions & 0 deletions src/utils/error.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ void perror_fatal(const char *s) {
void perror_fatal_code(const char *s, int err) {
char buffer[64];

#ifdef MINGW
fprintf(stderr, "%s: %s\n", s, strerror(err));
#else
strerror_r(err, buffer, sizeof(buffer));
fprintf(stderr, "%s: %s\n", s, buffer);
#endif

exit(YICES_EXIT_INTERNAL_ERROR);
}
6 changes: 4 additions & 2 deletions src/utils/timeout.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,16 @@ typedef struct timeout_s {
timeout_state_t state;
timeout_handler_t handler;
void *param;
#ifdef THREAD_SAFE
#if !defined(MINGW) && defined(THREAD_SAFE)
struct timespec ts;
pthread_t thread;
pthread_mutex_t mutex;
pthread_cond_t cond;
#endif
} timeout_t;

#ifndef THREAD_SAFE

#if !defined(THREAD_SAFE) || defined(MINGW)

/*
* Global structure common to both implementation.
Expand All @@ -93,6 +94,7 @@ static timeout_t the_timeout;

#endif


#ifndef MINGW


Expand Down

0 comments on commit 9d16834

Please sign in to comment.