dill_maxfd moved into utils module

Signed-off-by: Martin Sustrik <[email protected]>

Makefile.am

@@ -37,8 +37,6 @@ libdill_la_SOURCES = \
     cr.c \
     epoll.h.inc \
     epoll.c.inc \
-    fd.h \
-    fd.c \
     handle.h \
     handle.c \
     kqueue.h.inc \
@@ -59,7 +57,8 @@ libdill_la_SOURCES = \
     stack.c \
     ctx.h \
     ctx.c \
-    utils.h
+    utils.h \
+    utils.c
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libdill.pc

cr.c

@@ -30,7 +30,6 @@
 #endif
 
 #include "cr.h"
-#include "fd.h"
 #include "pollset.h"
 #include "stack.h"
 #include "utils.h"

epoll.c.inc

@@ -29,7 +29,6 @@
 #include <unistd.h>
 
 #include "cr.h"
-#include "fd.h"
 #include "list.h"
 #include "pollset.h"
 #include "utils.h"

kqueue.c.inc

@@ -32,7 +32,6 @@
 #include <unistd.h>
 
 #include "cr.h"
-#include "fd.h"
 #include "list.h"
 #include "pollset.h"
 #include "utils.h"

poll.c.inc

@@ -29,7 +29,6 @@
 #include <string.h>
 
 #include "cr.h"
-#include "fd.h"
 #include "list.h"
 #include "pollset.h"
 #include "utils.h"

fd.c → utils.c

@@ -1,6 +1,6 @@
 /*
 
-  Copyright (c) 2016 Martin Sustrik
+  Copyright (c) 2017 Martin Sustrik
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"),
@@ -25,7 +25,6 @@
 #include <sys/param.h>
 #include <sys/resource.h>
 
-#include "fd.h"
 #include "utils.h"
 
 int dill_maxfds(void) {

utils.h

@@ -1,6 +1,6 @@
 /*
 
-  Copyright (c) 2016 Martin Sustrik
+  Copyright (c) 2017 Martin Sustrik
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"),
@@ -87,5 +87,8 @@ static inline uint64_t __rdtsc() {
 #endif
 #endif
 
+/* Returns the maximum possible file descriptor number */
+int dill_maxfds(void);
+
 #endif