Fixed 02187c6e0c4f7ba0a0cd9a2859fefedf989c5a4b, added missing ifndef WITHOUT_PRE_1_9_X