Commit fe8ce541 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Include system headers before local ones to fix type conflict on OpenBSD

parent c4a98974
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

*/

#include "feh_png.h"

#include <png.h>

#include <stdio.h>
#include <stdarg.h>

#include "feh_png.h"

#define FEH_PNG_COMPRESSION 3
#define FEH_PNG_NUM_COMMENTS 4

+2 −2
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef FEH_PNG_H
#define FEH_PNG_H

#include "feh.h"

#include <stdio.h>
#include <stdarg.h>

#include "feh.h"

gib_hash *feh_png_read_comments(char *file);
int feh_png_write_png_fd(Imlib_Image image, int fd, ...);

+1 −1
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

*/
#include <strings.h>

#include "gib_hash.h"
#include "utils.h"
#include "debug.h"
#include <strings.h>

gib_hash_node *gib_hash_node_new(char *key, void *data)
{
+2 −1
Original line number Diff line number Diff line
@@ -24,10 +24,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

*/

#include <strings.h>

#include "feh.h"
#include "filelist.h"
#include "options.h"
#include <strings.h>

static void check_options(void);
static void feh_getopt_theme(int argc, char **argv);
+4 −2
Original line number Diff line number Diff line
@@ -24,12 +24,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

*/

#include <limits.h>
#include <sys/stat.h>

#include "feh.h"
#include "filelist.h"
#include "options.h"
#include "wallpaper.h"
#include <limits.h>
#include <sys/stat.h>

Window ipc_win = None;
Window my_ipc_win = None;
Atom ipc_atom = None;