internal.h must be before winreg.h include, and change path for include log.h in cardmod.c

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4091 c6295689-39f2-0310-b995-f0e70906c6a9

src/cardmod/cardmod.c

@@ -29,7 +29,6 @@
 
 #include "config.h"
 
-#include <log.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -38,6 +37,7 @@
 
 #include "libopensc/opensc.h"
 #include "libopensc/pkcs15.h"
+#include "libopensc/log.h"
 
 #define NULLSTR(a) (a == NULL ? "<NULL>" : a)
 #define NULLWSTR(a) (a == NULL ? L"<NULL>" : a)

src/libopensc/ctx.c

@@ -29,12 +29,12 @@
 #include <limits.h>
 #include <ltdl.h>
 
+#include "internal.h"
+
 #ifdef _WIN32
 #include <winreg.h>
 #endif
 
-#include "internal.h"
-
 int _sc_add_reader(sc_context_t *ctx, sc_reader_t *reader)
 {
 	assert(reader != NULL);