Develop and Download Open Source Software

Browse CVS Repository

Diff of /xoonips/AL/xnpal.cc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.48 by tani, Thu Jul 21 01:47:08 2005 UTC revision 1.49 by tani, Thu Jul 21 01:50:07 2005 UTC
# Line 259  zend_function_entry xnpalmod_functions[] Line 259  zend_function_entry xnpalmod_functions[]
259      ZEND_FE(xnp_extract_public_item_id   ,third_arg_force_ref)      ZEND_FE(xnp_extract_public_item_id   ,third_arg_force_ref)
260      ZEND_FE(xnp_extract_nonbinder_item_id,third_arg_force_ref)      ZEND_FE(xnp_extract_nonbinder_item_id,third_arg_force_ref)
261      ZEND_FE(xnp_insert_event             ,NULL)      ZEND_FE(xnp_insert_event             ,NULL)
 <<<<<<< xnpal.cc  
     ZEND_FE(xnp_get_events               ,NULL)  
     ZEND_FE(xnp_get_events_for_rss       ,NULL)  
 =======  
262      ZEND_FE(xnp_get_events               ,second_arg_force_ref)      ZEND_FE(xnp_get_events               ,second_arg_force_ref)
263  >>>>>>> 1.47      ZEND_FE(xnp_get_events_for_rss       ,NULL)
264          {NULL, NULL, NULL}      {NULL, NULL, NULL}
265  };  };
266    
267  /* compiled module information */  /* compiled module information */

Legend:
Removed from v.1.48  
changed lines
  Added in v.1.49

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26