include order for Windows (c2990d7) - Blinker · BlinkenArea

include order for Windows

Stefan Schuermans commited on 2017-10-28 20:24:17
Showing 2 changed files, with 3 additions and 1 deletions.

"winsock2.h" must be included before "windows.h".
So if some file needs "winsock2.h", no other file may include "windows.h"
without including "winsock2.h" first.

src/windows/Time.cpp bb83890..da26429
src/windows/Time.h 038d67d..d5b29b7

src/windows/Time.cpp

View file @ c2990d7

@@ -3,9 +3,10 @@
    Copyleft GNU public license - http://www.gnu.org/copyleft/gpl.html
    a blinkenarea.org project */
 
+#include <winsock2.h> // not allowed after windows.h, so include here
+#include <windows.h>
 #include <math.h>
 #include <stdint.h>
-#include <windows.h>
 
 #include "Time.h"
 

src/windows/Time.h

View file @ c2990d7

@@ -6,6 +6,7 @@
 #ifndef BLINKER_TIME_H
 #define BLINKER_TIME_H
 
+#include <winsock2.h> // not allowed after windows.h, so include here
 #include <windows.h>
 #include <stdint.h>
 


...	...	@@ -3,9 +3,10 @@
3	3	Copyleft GNU public license - http://www.gnu.org/copyleft/gpl.html
4	4	a blinkenarea.org project */
5	5
	6	+#include <winsock2.h> // not allowed after windows.h, so include here
	7	+#include <windows.h>
6	8	#include <math.h>
7	9	#include <stdint.h>
8		-#include <windows.h>
9	10
10	11	#include "Time.h"
11	12

...	...	@@ -6,6 +6,7 @@
6	6	#ifndef BLINKER_TIME_H
7	7	#define BLINKER_TIME_H
8	8
	9	+#include <winsock2.h> // not allowed after windows.h, so include here
9	10	#include <windows.h>
10	11	#include <stdint.h>
11	12
12	13