Add stdint defines if we dont have stdint.h

DrQueue · Jun 23, 2010 · e5e2617 · e5e2617
1 parent b899330
commit e5e2617
Show file tree

Hide file tree

Showing 43 changed files with 316 additions and 223 deletions.
diff --git a/drqman/drqm_autorefresh.c b/drqman/drqm_autorefresh.c
@@ -19,11 +19,6 @@
 // USA
 //
 
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <pwd.h>
-#include <sys/types.h>
 #include <gtk/gtk.h>
 
 #include "drqm_autorefresh.h"

diff --git a/drqman/drqm_computers.c b/drqman/drqm_computers.c
@@ -20,12 +20,11 @@
 // USA
 //
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/types.h>
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#include <stdarg.h>
+#endif
+
+#include "constants.h"
 
 #include "drqman.h"
 #include "drqm_request.h"

diff --git a/drqman/drqm_info.c b/drqman/drqm_info.c
@@ -19,12 +19,6 @@
 // USA
 //
 
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <pwd.h>
-#include <sys/types.h>
-
 #include "drqman.h"
 #include "drqm_common.h"
 

diff --git a/drqman/drqm_jobs.c b/drqman/drqm_jobs.c
@@ -20,12 +20,11 @@
 // USA
 //
 
-#include <string.h>
-#include <stdlib.h>
-#include <pwd.h>
-#include <sys/types.h>
-#include <stdint.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#include <sys/types.h>
+#include <pwd.h>
 
 #include "libdrqueue.h"
 

diff --git a/drqman/drqm_jobs_aqsis.c b/drqman/drqm_jobs_aqsis.c
@@ -19,16 +19,10 @@
 // USA
 //
 
-#ifdef HAVE_CONFIG_H
-#   include <lconfig.h>
-#endif
-
-#include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#include <stdlib.h>
+#endif
 #include <pwd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
 #include "aqsissg.h"
 #include "drqm_jobs.h"

diff --git a/drqman/drqm_jobs_blender.c b/drqman/drqm_jobs_blender.c
@@ -19,12 +19,6 @@
 // USA
 //
 
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <pwd.h>
-#include <sys/types.h>
-
 #include "drqm_jobs.h"
 #include "drqm_common.h"
 #include "drqm_jobs_blender.h"

diff --git a/drqman/drqm_jobs_jdd.c b/drqman/drqm_jobs_jdd.c
@@ -20,12 +20,19 @@
 // USA
 //
 
-#include <stdlib.h>
-#include <string.h>
+#include <stdio.h>
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#include <sys/types.h>
-#include <stdio.h>
+#endif
+#ifdef _WIN32
+#include <io.h>
+#endif
+
+#include "constants.h"
 
 // Graphics
 #include "waiting.xpm"

diff --git a/drqman/drqm_jobs_lightwave.c b/drqman/drqm_jobs_lightwave.c
@@ -19,12 +19,12 @@
 // USA
 //
 
-#include <string.h>
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#include <stdlib.h>
+#endif
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "drqm_jobs.h"
 #include "drqm_common.h"

diff --git a/drqman/drqm_jobs_luxrender.c b/drqman/drqm_jobs_luxrender.c
@@ -19,12 +19,6 @@
 // USA
 //
 
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <pwd.h>
-#include <sys/types.h>
-
 #include "drqm_jobs.h"
 #include "drqm_common.h"
 #include "drqm_jobs_luxrender.h"

diff --git a/drqman/drqm_jobs_mantra.c b/drqman/drqm_jobs_mantra.c
@@ -19,16 +19,12 @@
 // USA
 //
 
-#ifdef HAVE_CONFIG_H
-#   include <lconfig.h>
-#endif
-
-#include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#include <stdlib.h>
+#endif
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
+
 
 #include "mantrasg.h"
 #include "drqm_jobs.h"

diff --git a/drqman/drqm_jobs_maya.c b/drqman/drqm_jobs_maya.c
@@ -19,12 +19,11 @@
 // USA
 //
 
-#include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#include <stdlib.h>
+#endif
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "drqm_jobs.h"
 #include "drqm_common.h"
@@ -520,4 +519,4 @@ dnj_koj_frame_maya_toggle_button(GtkWidget *button, struct drqmj_koji_maya *info
 	}
 }
 
-
+
diff --git a/drqman/drqm_jobs_mentalray.c b/drqman/drqm_jobs_mentalray.c
@@ -19,12 +19,11 @@
 // USA
 //
 
-#include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#include <stdlib.h>
+#endif
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "drqm_jobs.h"
 #include "drqm_common.h"

diff --git a/drqman/drqm_jobs_nuke.c b/drqman/drqm_jobs_nuke.c
@@ -19,12 +19,11 @@
 // USA
 //
 
-#include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#include <stdlib.h>
+#endif
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "drqm_jobs.h"
 #include "drqm_common.h"

diff --git a/drqman/drqm_jobs_pixie.c b/drqman/drqm_jobs_pixie.c
@@ -19,12 +19,6 @@
 // USA
 //
 
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <pwd.h>
-#include <sys/types.h>
-
 #include "drqm_jobs.h"
 #include "drqm_common.h"
 #include "drqm_jobs_pixie.h"

diff --git a/drqman/drqm_jobs_shake.c b/drqman/drqm_jobs_shake.c
@@ -19,12 +19,6 @@
 // USA
 //
 
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <pwd.h>
-#include <sys/types.h>
-
 #include "drqm_jobs.h"
 #include "drqm_common.h"
 #include "drqm_jobs_shake.h"

diff --git a/drqman/drqm_jobs_turtle.c b/drqman/drqm_jobs_turtle.c
@@ -19,12 +19,11 @@
 // USA
 //
 
-#include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#include <stdlib.h>
+#endif
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "drqm_jobs.h"
 #include "drqm_common.h"

diff --git a/drqman/drqm_jobs_xsi.c b/drqman/drqm_jobs_xsi.c
@@ -19,12 +19,11 @@
 // USA
 //
 
-#include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#include <stdlib.h>
+#endif
 #include <pwd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "drqm_jobs.h"
 #include "drqm_common.h"

diff --git a/drqman/drqm_request.c b/drqman/drqm_request.c
@@ -20,19 +20,10 @@
 // USA
 //
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
 #include "libdrqueue.h"
 #include "drqm_jobs.h"
 #include "drqm_computers.h"
 #include "drqm_request.h"
-#include "logger.h"
 
 void
 drqm_request_joblist (struct drqm_jobs_info *info) {

diff --git a/drqman/main.c b/drqman/main.c
@@ -19,18 +19,9 @@
 // USA
 //
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/sem.h>
-#include <errno.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <string.h>
-#include <ctype.h>
+#endif
 
 #include "drqman.h"
 #include "drqm_common.h"

diff --git a/libdrqueue/aqsissg.h b/libdrqueue/aqsissg.h
@@ -23,26 +23,12 @@
 #ifndef _AQSISSG_H_
 #define _AQSISSG_H_
 
-#ifdef __LINUX
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#else
-# ifdef __IRIX
-#  include <sys/types.h>
-# else
-#  ifdef __OSX
-#  include <stdint.h>
-#  else
-#  ifdef __FREEBSD
-#   include <stdint.h>
-#  else
-#   ifdef __CYGWIN
-#   include <stdint.h>
-#   else
-#   error You need to define the OS, or OS defined not supported
-#   endif
-#  endif
-#  endif
-# endif
+#endif
+
+#ifdef __IRIX
+#include <sys/types.h>
 #endif
 
 #include "constants.h"

diff --git a/libdrqueue/blendersg.h b/libdrqueue/blendersg.h
@@ -23,8 +23,11 @@
 #ifndef _BLENDERSG_H_
 #define _BLENDERSG_H_
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
 #include "constants.h"
-#include "stdint.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/libdrqueue/computer_status.c b/libdrqueue/computer_status.c
@@ -28,19 +28,10 @@
 #include <unistd.h>
 #endif
 
-#if defined(__LINUX)
-# include <stdint.h>
-#elif defined(__IRIX)
-# include <sys/types.h>
+#if defined(__IRIX)
 # include <sys/sysget.h>
 #elif defined(__OSX)
-# include <stdint.h>
 # include <string.h>
-#elif defined(__FREEBSD)
-# include <stdint.h>
-#elif defined(__CYGWIN)
-#else
-# error You need to define the OS, or OS defined not supported
 #endif
 
 #include "computer_status.h"

diff --git a/libdrqueue/computer_status.h b/libdrqueue/computer_status.h
@@ -22,12 +22,15 @@
 #ifndef _COMPUTER_STATUS_H_
 #define _COMPUTER_STATUS_H_
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#include <sys/types.h>
+
 #include "constants.h"
 #include "task.h"
 
-#include <time.h>
-#include <sys/types.h>
-#include <stdint.h>
 
 #pragma pack(push,1)