* Work around a bug in Apple's GCC preprocessor.
This commit is contained in:
		
							parent
							
								
									4caca58ff7
								
							
						
					
					
						commit
						ae7990cc88
					
				
					 3 changed files with 5 additions and 4 deletions
				
			
		|  | @ -1,10 +1,10 @@ | ||||||
|  | #include "config.h" | ||||||
|  | 
 | ||||||
| #include "shared.hh" | #include "shared.hh" | ||||||
| #include "globals.hh" | #include "globals.hh" | ||||||
| #include "store-api.hh" | #include "store-api.hh" | ||||||
| #include "util.hh" | #include "util.hh" | ||||||
| 
 | 
 | ||||||
| #include "config.h" |  | ||||||
| 
 |  | ||||||
| #include <iostream> | #include <iostream> | ||||||
| #include <cctype> | #include <cctype> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,3 +1,4 @@ | ||||||
|  | #include "config.h" | ||||||
| #include "local-store.hh" | #include "local-store.hh" | ||||||
| #include "util.hh" | #include "util.hh" | ||||||
| #include "globals.hh" | #include "globals.hh" | ||||||
|  | @ -7,7 +8,6 @@ | ||||||
| #include "aterm.hh" | #include "aterm.hh" | ||||||
| #include "derivations-ast.hh" | #include "derivations-ast.hh" | ||||||
| #include "worker-protocol.hh" | #include "worker-protocol.hh" | ||||||
| #include "config.h" |  | ||||||
|      |      | ||||||
| #include <iostream> | #include <iostream> | ||||||
| #include <algorithm> | #include <algorithm> | ||||||
|  |  | ||||||
|  | @ -1,3 +1,5 @@ | ||||||
|  | #include "config.h" | ||||||
|  | 
 | ||||||
| #include <sys/types.h> | #include <sys/types.h> | ||||||
| #include <sys/stat.h> | #include <sys/stat.h> | ||||||
| #include <unistd.h> | #include <unistd.h> | ||||||
|  | @ -10,7 +12,6 @@ | ||||||
| #include <iostream> | #include <iostream> | ||||||
| #include <vector> | #include <vector> | ||||||
| 
 | 
 | ||||||
| #include "config.h" |  | ||||||
| #include "util.hh" | #include "util.hh" | ||||||
| 
 | 
 | ||||||
| using namespace nix; | using namespace nix; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue