* Make sure that config.h is included before the system headers,

guiwf/lix

because it defines _FILE_OFFSET_BITS.  Without this, on 
  OpenSolaris the system headers define it to be 32, and then 
  the 32-bit stat() ends up being called with a 64-bit "struct 
  stat", or vice versa.

  This also ensures that we get 64-bit file sizes everywhere.

* Remove the redundant call to stat() in parseExprFromFile().
  The file cannot be a symlink because that's the exit condition
  of the loop before.

This commit is contained in:

Eelco Dolstra

2010-10-04 17:55:38 +00:00

parent 95f4f2cf61

commit 705868a8a9

12 changed files with 29 additions and 29 deletions

									
										src/libexpr/nixexpr.hh
									
		+2
		-2
	
												View File
												
				@@ -1,10 +1,10 @@

				#ifndef __NIXEXPR_H

				#define __NIXEXPR_H

				#include <map>

				#include "symbol-table.hh"

				#include <map>

				namespace nix {