diff --git a/src/server/distrend.c b/src/server/distrend.c --- a/src/server/distrend.c +++ b/src/server/distrend.c @@ -165,7 +165,7 @@ int main(int argc, char *argv[]) /* If the client is idle, must be modified for climbing through linked list of clients (client->clientnum) */ if(clientstatus == CLIENTSTATUS_IDLE) { - int returnnum = find_jobframe(general_info.conn, slaveKey, job->jobnum, frame->num); // Finds a frame to render @FIXME: Slavenum :D + int returnnum = find_jobframe(general_info.conn, slaveKey, &job->jobnum, &frame->num); // Finds a frame to render @FIXME: Slavenum :D if(returnnum) { fprintf(stderr,"No frames are available to render at this time. Idling...\n"); @@ -422,7 +422,7 @@ int interactiveTest(int test, struct gen int command; fprintf(stderr,"Hello!\n"); int32_t slaveKey = 1; - int32_t jobKey = 0; + jobnum_t jobKey = 0; int32_t frameNum = 0; int32_t newPriority = 0; int tmp = 0; diff --git a/src/server/mysql.c b/src/server/mysql.c --- a/src/server/mysql.c +++ b/src/server/mysql.c @@ -244,7 +244,7 @@ int change_job_priority(distrend_mysql_c return 0; } -int find_jobframe(distrend_mysql_conn_t conn, int32_t slavekey, int32_t *jobkey, int32_t *framenum) +int find_jobframe(distrend_mysql_conn_t conn, int32_t slavekey, jobnum_t *jobkey, int32_t *framenum) { distrend_mysql_result_t result; char *query; @@ -265,7 +265,7 @@ int find_jobframe(distrend_mysql_conn_t return 1; } - distrend_mysql_getint(row, 0, jobkey); + distrend_mysql_getint(row, 0, (int32_t *)jobkey); distrend_mysql_getint(row, 1, framenum); diff --git a/src/server/mysql.h b/src/server/mysql.h --- a/src/server/mysql.h +++ b/src/server/mysql.h @@ -22,6 +22,8 @@ #ifndef MYSQL_H_ #define MYSQL_H_ +#include "distrenjob.h" + #include struct distrend_mysql_conn; @@ -62,7 +64,7 @@ int change_job_priority(distrend_mysql_c /** Frame Finder: Finds a frame for a slave to render */ -int find_jobframe(distrend_mysql_conn_t conn, int32_t slaveKey, int32_t *jobKey, int32_t *frameNum); +int find_jobframe(distrend_mysql_conn_t conn, int32_t slaveKey, jobnum_t *jobKey, int32_t *frameNum);