maria-developers team mailing list archive

[Kristian Nielsen <knielsen@xxxxxxxxxxxxxxx>]

Vladislav Vaintroub <wlad@xxxxxxxxxxxxxxxx> writes:

>   Fix compiling on Windows.

Thanks for your help! I'm now merging this into the MWL#192 tree.

All the changes are good, but I would like your help to understand a couple of them:

> === modified file 'client/async_example.c'
> --- a/client/async_example.c	2011-06-14 09:11:47 +0000
> +++ b/client/async_example.c	2011-06-22 14:38:52 +0000
> @@ -17,8 +17,6 @@
>    along with this.  If not, see <http://www.gnu.org/licenses/>.
>  */
>  
> -#include <stdlib.h>
> -#include <stdio.h>
>  
>  #ifndef __WIN__
>  #include <poll.h>
> @@ -26,10 +24,9 @@
>  #include <WinSock2.h>
>  #endif
>  
> -/* For some reason, mysql.h does not work here on Windows, but client_priv.h does.
> +#include <stdlib.h>
> +#include <stdio.h>
>  #include <mysql.h>
> -*/
> -#include <client_priv.h>
>  
>  #define SL(s) (s), sizeof(s)

Why does this patch fix the problem? I guess the real question is what did I
do wrong originally? Is it that it is incorrect on windows to include stdlib.h
/ stdio.h before Winsock2.h ?

> === modified file 'include/typelib.h'
> --- a/include/typelib.h	2009-03-12 22:27:35 +0000
> +++ b/include/typelib.h	2011-06-22 14:38:52 +0000
> @@ -29,7 +29,7 @@
>  extern my_ulonglong find_typeset(char *x, TYPELIB *typelib,int *error_position);
>  extern int find_type_with_warning(const char *x, TYPELIB *typelib,
>                                    const char *option);
> -extern uint find_type_or_exit(const char *x, TYPELIB *typelib,
> +extern unsigned int find_type_or_exit(const char *x, TYPELIB *typelib,
>                                const char *option);
>  extern int find_type(char *x, const TYPELIB *typelib, unsigned int full_name);
>  extern void make_type(char *to,unsigned int nr,TYPELIB *typelib);

I do not understand what this patch has to do with my MWL#192 changes, can you
help explain? (Again, I think the change is correct, I just would like to
understand what I did to make this change necessary).

 - Kristian.