REORG: include: move lb_fwrr.h to haproxy/lb_fwrr{,-t}.h
Nothing fancy, includes were already OK. The proto didn't reference the
type, this was fixed. Still references proxy.h and server.h from types/.
diff --git a/include/types/backend.h b/include/types/backend.h
index 19a45f0..8a1f3bd 100644
--- a/include/types/backend.h
+++ b/include/types/backend.h
@@ -25,10 +25,10 @@
#include <haproxy/lb_chash-t.h>
#include <haproxy/lb_fas-t.h>
#include <haproxy/lb_fwlc-t.h>
+#include <haproxy/lb_fwrr-t.h>
#include <haproxy/api-t.h>
#include <haproxy/thread.h>
-#include <types/lb_fwrr.h>
#include <types/lb_map.h>
#include <types/server.h>
diff --git a/include/types/lb_fwrr.h b/include/types/lb_fwrr.h
deleted file mode 100644
index 6a2a04c..0000000
--- a/include/types/lb_fwrr.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * include/types/lb_fwrr.h
- * Types for Fast Weighted Round Robin load balancing algorithm.
- *
- * Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, version 2.1
- * exclusively.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef _TYPES_LB_FWRR_H
-#define _TYPES_LB_FWRR_H
-
-#include <haproxy/api-t.h>
-#include <import/ebtree.h>
-
-/* This structure is used to apply fast weighted round robin on a server group */
-struct fwrr_group {
- struct eb_root curr; /* tree for servers in "current" time range */
- struct eb_root t0, t1; /* "init" and "next" servers */
- struct eb_root *init; /* servers waiting to be placed */
- struct eb_root *next; /* servers to be placed at next run */
- int curr_pos; /* current position in the tree */
- int curr_weight; /* total weight of the current time range */
- int next_weight; /* total weight of the next time range */
-};
-
-struct lb_fwrr {
- struct fwrr_group act; /* weighted round robin on the active servers */
- struct fwrr_group bck; /* weighted round robin on the backup servers */
-};
-
-#endif /* _TYPES_LB_FWRR_H */
-
-/*
- * Local variables:
- * c-indent-level: 8
- * c-basic-offset: 8
- * End:
- */