fix build warnings

windows/about.c

@@ -16,9 +16,12 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <windows.h>
 #include <stdio.h>
 
+#include "utils/config.h"
+
+#include <windows.h>
+
 #include "utils/utils.h"
 #include "utils/messages.h"
 #include "desktop/netsurf.h"

windows/bitmap.c

@@ -20,6 +20,9 @@
 #include <inttypes.h>
 #include <sys/types.h>
 #include <string.h>
+
+#include "utils/config.h"
+
 #include <windows.h>
 
 #include "image/bitmap.h"

windows/download.c

@@ -17,10 +17,13 @@
  */
 
 #include <limits.h>
-#include <windows.h>
-#include <shlobj.h>
 #include <sys/time.h>
 
+#include "utils/config.h"
+
+#include <shlobj.h>
+#include <windows.h>
+
 #include "content/fetch.h"
 #include "desktop/gui.h"
 #include "utils/schedule.h"

windows/drawable.c

@@ -18,6 +18,8 @@
 
 #include <stdbool.h>
 
+#include "utils/config.h"
+
 #include <windows.h>
 #include <windowsx.h>
 

windows/findfile.c

@@ -17,7 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <winsock2.h>
 #include <windows.h>
+
 #include <limits.h>
 #include <unistd.h>
 #include <stdbool.h>
@@ -25,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+
 #include <curl/curl.h>
 
 #include "utils/url.h"

windows/font.c

@@ -21,7 +21,11 @@
 #include <inttypes.h>
 
 #include <assert.h>
+
+#include "utils/config.h"
+
 #include <windows.h>
+
 #include "css/css.h"
 #include "render/font.h"
 #include "desktop/options.h"

windows/gui.c

@@ -23,6 +23,8 @@
 #include <unistd.h>
 #include <string.h>
 
+#include "utils/config.h"
+
 #include <windows.h>
 #include <windowsx.h>
 #include <commctrl.h>

windows/localhistory.c

@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "utils/config.h"
+
 #include <windows.h>
 #include <windowsx.h>
 #include <commctrl.h>

windows/main.c

@@ -18,6 +18,9 @@
 
 #include <limits.h>
 #include <stdbool.h>
+
+#include "utils/config.h"
+
 #include <windows.h>
 
 #include "desktop/gui.h"

windows/misc.c

@@ -20,6 +20,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
+#include "utils/config.h"
+
 #include <windows.h>
 
 #include "desktop/cookies.h"

windows/plot.c

@@ -22,6 +22,9 @@
 #include <string.h>
 #include <limits.h>
 #include <math.h>
+
+#include "utils/config.h"
+
 #include <windows.h>
 
 #include "utils/log.h"
@@ -94,12 +97,13 @@ static bool line(int x0, int y0, int x1, int y1, const plot_style_t *style)
 		DeleteObject(clipregion);
 		return false;
 	}
+/*
 	RECT r;
 	r.left = x0;
 	r.top = y0;
 	r.right = x1;
 	r.bottom = y1;
-
+*/
 	SelectClipRgn(plot_hdc, clipregion);
 
 	MoveToEx(plot_hdc, x0, y0, (LPPOINT) NULL);
@@ -276,15 +280,16 @@ static bool text(int x, int y, const char *text, size_t length,
 	int wlen;
 	SIZE s;
 	LPWSTR wstring;
-	RECT r;
 	fontbak = (HFONT) SelectObject(plot_hdc, font);
 	GetTextExtentPoint(plot_hdc, text, length, &s);
 
+/*
+	RECT r;
 	r.left = x;
 	r.top = y  - (3 * s.cy) / 4;
 	r.right = x + s.cx;
 	r.bottom = y + s.cy / 4;
-
+*/
 	SelectClipRgn(plot_hdc, clipregion);
 
 	SetTextAlign(plot_hdc, TA_BASELINE | TA_LEFT);
@@ -354,12 +359,13 @@ static bool disc(int x, int y, int radius, const plot_style_t *style)
 		DeleteObject(brush);
 		return false;
 	}
+/*
 	RECT r;
 	r.left = x - radius;
 	r.top = y - radius;
 	r.right = x + radius;
 	r.bottom = y + radius;
-
+*/
 	SelectClipRgn(plot_hdc, clipregion);
 
 	if (style->fill_type == PLOT_OP_TYPE_NONE)
@@ -408,7 +414,7 @@ static bool arc(int x, int y, int radius, int angle1, int angle2,
 		DeleteObject(pen);
 		return false;
 	}
-	RECT r;
+
 	int q1, q2;
 	double a1=1.0, a2=1.0, b1=1.0, b2=1.0;
 	q1 = (int) ((angle1 + 45) / 90) - 45;
@@ -462,11 +468,13 @@ static bool arc(int x, int y, int radius, int angle1, int angle2,
 		break;
 	}
 
+/*
+	RECT r;
 	r.left = x - radius;
 	r.top = y - radius;
 	r.right = x + radius;
 	r.bottom = y + radius;
-
+*/
 	SelectClipRgn(plot_hdc, clipregion);
 
 	Arc(plot_hdc, x - radius, y - radius, x + radius, y + radius,

windows/prefs.c

@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "utils/config.h"
+
 #include <windows.h>
 #include <commctrl.h>
 

windows/thumbnail.c

@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "utils/config.h"
+
 #include <windows.h>
 
 #include "content/urldb.h"