Marlin - extruder_offset not declared error

Hi all,
i am currently modifying Marlin (Date 24th Dec. 2014) to work with a dual X Carriage setup. SO far changing the configuration was pretty much straight forward, but now i get a compile error in Marlin_main.cpp. 'extruder_offset' was not declared in this scope in x_home_pos

static float x_home_pos(int extruder) {
  if (extruder == 0)
    return base_home_pos(X_AXIS) + add_homing[X_AXIS];
  else
    // In dual carriage mode the extruder offset provides an override of the
    // second X-carriage offset when homed - otherwise X2_HOME_POS is used.
    // This allow soft recalibration of the second extruder offset position without firmware reflash
    // (through the M218 command).
    return (extruder_offset[X_AXIS][1] > 0) ? extruder_offset[X_AXIS][1] : X2_HOME_POS;
}

I made sure that extruder offset x and y are defined but can't find any other reason for the problem.
Any help is much appreciated.
Cheers
Björn

---

[www.bonkers.de]
[merlin-hotend.de]
[www.hackerspace-ffm.de]

Some more info. While the main error displayed is the not declared extruder_offset the first error is
Marlin_main.cpp:862:6: error: #error "Missing or invalid definitions for DUAL_X_CARRIAGE mode."

Marlin_main.cpp:862:6: error: #error "Missing or invalid definitions for DUAL_X_CARRIAGE mode."
Marlin_main.cpp: In function 'float x_home_pos(int)':
Marlin_main.cpp:881: error: 'extruder_offset' was not declared in this scope
Marlin_main.cpp: In function 'void axis_is_at_home(int)':
Marlin_main.cpp:903: error: 'extruder_offset' was not declared in this scope
Marlin_main.cpp:909: error: 'extruder_offset' was not declared in this scope
Marlin_main.cpp: In function 'void process_commands()':
.......

---

[www.bonkers.de]
[merlin-hotend.de]
[www.hackerspace-ffm.de]

Problem solved, more or less. It seems the current state or Marlin is a bit off. Someone seems to be doing a lot of code reworking and not everything is working right now as it did. A version from end of november worked fine for me.

---

[www.bonkers.de]
[merlin-hotend.de]
[www.hackerspace-ffm.de]