mirror of
				https://gitlab.gnome.org/GNOME/glib.git
				synced 2025-11-04 10:08:56 +01:00 
			
		
		
		
	Fix build error when compiling with mingw
uintptr_t must be defined when including valgrind.h, just move it as last include solves the problem. https://bugzilla.gnome.org/show_bug.cgi?id=796283
This commit is contained in:
		
				
					committed by
					
						
						Nirbheek Chauhan
					
				
			
			
				
	
			
			
			
						parent
						
							d89c8894a8
						
					
				
				
					commit
					00178f8c8e
				
			@@ -22,7 +22,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include "config.h"
 | 
					#include "config.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "../glib/valgrind.h"
 | 
					 | 
				
			||||||
#include <string.h>
 | 
					#include <string.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <ffi.h>
 | 
					#include <ffi.h>
 | 
				
			||||||
@@ -35,6 +34,7 @@
 | 
				
			|||||||
#include "gvaluetypes.h"
 | 
					#include "gvaluetypes.h"
 | 
				
			||||||
#include "gtype-private.h"
 | 
					#include "gtype-private.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "../glib/valgrind.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * SECTION:gclosure
 | 
					 * SECTION:gclosure
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,7 +21,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include "config.h"
 | 
					#include "config.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "../glib/valgrind.h"
 | 
					 | 
				
			||||||
#include <string.h>
 | 
					#include <string.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "gtype.h"
 | 
					#include "gtype.h"
 | 
				
			||||||
@@ -38,6 +37,8 @@
 | 
				
			|||||||
#include <windows.h>
 | 
					#include <windows.h>
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "../glib/valgrind.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef	G_ENABLE_DEBUG
 | 
					#ifdef	G_ENABLE_DEBUG
 | 
				
			||||||
#define	IF_DEBUG(debug_type)	if (_g_type_debug_flags & G_TYPE_DEBUG_ ## debug_type)
 | 
					#define	IF_DEBUG(debug_type)	if (_g_type_debug_flags & G_TYPE_DEBUG_ ## debug_type)
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user