Skip to content

Fix compile issues under Ruby 1.9 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tmm1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compile issues under Ruby 1.9 #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions ext/system_timer/system_timer_native.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/

#include "ruby.h"
#include "rubysig.h"
#include <signal.h>
#include <errno.h>
#include <stdarg.h>
Expand All @@ -17,6 +16,14 @@

static VALUE rb_cSystemTimer;

#ifdef RUBY_VM
static int rb_thread_critical; /* dummy */
#define CHECK_INTS
#else
/* use rb_thread_critical on Ruby 1.8.x */
#include "rubysig.h"
#endif

// Ignore most of this for Rubinius
#ifndef RUBINIUS

Expand All @@ -34,8 +41,8 @@ static void restore_original_timer_interval();
static void set_itimerval_with_minimum_1s_interval(struct itimerval *, VALUE);
static void set_itimerval(struct itimerval *, double);
static void restore_sigalrm_mask(sigset_t *previous_mask);
static void log_debug(char*, ...);
static void log_error(char*, int);
static void log_debug(const char*, ...);
static void log_error(const char*, int);


static VALUE install_first_timer_and_save_original_configuration(VALUE self, VALUE seconds)
Expand Down Expand Up @@ -234,7 +241,7 @@ static VALUE disable_debug(VALUE self) {
return Qnil;
}

static void log_debug(char* message, ...)
static void log_debug(const char* message, ...)
{
va_list argp;

Expand All @@ -246,7 +253,7 @@ static void log_debug(char* message, ...)
return;
}

static void log_error(char* message, int display_errno)
static void log_error(const char* message, int display_errno)
{
fprintf(stderr, "%s: %s\n", message, display_errno ? strerror(errno) : "");
return;
Expand Down Expand Up @@ -291,8 +298,8 @@ static void set_itimerval(struct itimerval *value, double seconds) {
}
value->it_interval.tv_usec = 0;
value->it_interval.tv_sec = 0;
value->it_value.tv_sec = (long int) (seconds);
value->it_value.tv_usec = (long int) ((seconds - value->it_value.tv_sec) \
value->it_value.tv_sec = (time_t) (seconds);
value->it_value.tv_usec = (suseconds_t) ((seconds - value->it_value.tv_sec) \
* MICRO_SECONDS);
if (debug_enabled) {
log_debug("[set_itimerval] Set to %ds + %dus\n", value->it_value.tv_sec,
Expand Down