Changeset 987 for trunk/xcache.h

Show
Ignore:
Timestamp:
07/18/2012 05:19:57 AM (10 months ago)
Author:
moo
Message:

main/ conflict with php/main/

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/xcache.h

    r982 r987  
    2020#include <config.h> 
    2121#endif 
    22 #include "xc_shm.h" 
    23 #include "xc_lock.h" 
     22#include "xcache/xc_shm.h" 
     23#include "xcache/xc_lock.h" 
    2424 
    2525#if !defined(ZEND_ENGINE_2_4) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 4 || PHP_MAJOR_VERSION > 5)