Kaydet (Commit) 0bb6014d authored tarafından Ozan Çağlayan's avatar Ozan Çağlayan

Reorder headers to avoid build failures

I can't build comar on Pardus 2011 and openSUSE without this.

BUG:FIXED:12248
üst a4392a60
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#ifndef POLICY_H #ifndef POLICY_H
#define POLICY_H #define POLICY_H
#include <dbus/dbus.h>
#include <Python.h> #include <Python.h>
#include <dbus/dbus.h>
#define POLICY_YES 1 #define POLICY_YES 1
#define POLICY_AUTH 0 #define POLICY_AUTH 0
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#define TYPES_BASIC "sbixd" #define TYPES_BASIC "sbixd"
#define TYPES_CONTAINER "arD" #define TYPES_CONTAINER "arD"
#include <dbus/dbus.h>
#include <Python.h> #include <Python.h>
#include <dbus/dbus.h>
char *get_obj_sign(PyObject *obj); char *get_obj_sign(PyObject *obj);
......
...@@ -24,6 +24,13 @@ ...@@ -24,6 +24,13 @@
* *
*/ */
#include "config.h"
#include "log.h"
#include "process.h"
#include "pydbus.h"
#include "script.h"
#include "utils.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
...@@ -35,12 +42,7 @@ ...@@ -35,12 +42,7 @@
#include <unistd.h> #include <unistd.h>
#include <dirent.h> #include <dirent.h>
#include "config.h"
#include "log.h"
#include "process.h"
#include "pydbus.h"
#include "script.h"
#include "utils.h"
//! DBus connection //! DBus connection
DBusConnection *bus_conn; DBusConnection *bus_conn;
......
...@@ -24,19 +24,19 @@ ...@@ -24,19 +24,19 @@
* *
*/ */
#include <Python.h>
#include <dbus/dbus.h>
#include <dirent.h>
#include <unistd.h>
#include <sys/file.h>
#include <sys/stat.h>
#include "config.h" #include "config.h"
#include "iksemel.h" #include "iksemel.h"
#include "script.h" #include "script.h"
#include "log.h" #include "log.h"
#include "utils.h" #include "utils.h"
#include <dirent.h>
#include <unistd.h>
#include <sys/file.h>
#include <sys/stat.h>
#include <dbus/dbus.h>
//! Validates model file //! Validates model file
int int
db_validate_model(iks *xml, char *filename) db_validate_model(iks *xml, char *filename)
......
...@@ -24,12 +24,13 @@ ...@@ -24,12 +24,13 @@
* *
*/ */
#include "config.h"
#include "process.h"
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
#include "config.h"
#include "process.h"
//! Puts time into file //! Puts time into file
void void
......
...@@ -24,6 +24,15 @@ ...@@ -24,6 +24,15 @@
* *
*/ */
#include "bus.h"
#include "config.h"
#include "log.h"
#include "process.h"
#include "policy.h"
#include "pydbus.h"
#include "script.h"
#include "utils.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
...@@ -35,15 +44,6 @@ ...@@ -35,15 +44,6 @@
#include <unistd.h> #include <unistd.h>
#include <dirent.h> #include <dirent.h>
#include "bus.h"
#include "config.h"
#include "log.h"
#include "process.h"
#include "policy.h"
#include "pydbus.h"
#include "script.h"
#include "utils.h"
#define MAX_FDS 1024 #define MAX_FDS 1024
#define MAX_PROC 500 #define MAX_PROC 500
#define MAX_WATCHES 10 #define MAX_WATCHES 10
......
...@@ -24,11 +24,6 @@ ...@@ -24,11 +24,6 @@
* *
*/ */
#include <Python.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include "config.h" #include "config.h"
#include "log.h" #include "log.h"
#include "loop.h" #include "loop.h"
...@@ -36,6 +31,10 @@ ...@@ -36,6 +31,10 @@
#include "script.h" #include "script.h"
#include "utils.h" #include "utils.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
......
...@@ -24,6 +24,10 @@ ...@@ -24,6 +24,10 @@
* *
*/ */
#include "process.h"
#include "log.h"
#include "utils.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
...@@ -33,10 +37,6 @@ ...@@ -33,10 +37,6 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include "process.h"
#include "log.h"
#include "utils.h"
struct Proc my_proc; struct Proc my_proc;
struct ProcChild * struct ProcChild *
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
* *
*/ */
#include <string.h>
#include "bus.h" #include "bus.h"
#include "config.h" #include "config.h"
#include "db.h" #include "db.h"
...@@ -35,6 +33,8 @@ ...@@ -35,6 +33,8 @@
#include "process.h" #include "process.h"
#include "utils.h" #include "utils.h"
#include <string.h>
//! Core dictionary //! Core dictionary
PyObject *py_core; PyObject *py_core;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment