Changeset 119

Show
Ignore:
Timestamp:
07/09/05 11:29:47 (3 years ago)
Author:
zoeloelip
Message:

Removed atexit code that only produced segfaults and didn't work

(Patch from Rob Foehl)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • eaccelerator/trunk/ChangeLog

    r118 r119  
    22 
    33        * A compile fix for php4 (bug #1235017) 
     4        * Removed atexit code that only produced segfaults and didn't work 
     5          (Patch from Rob Foehl <rwf at loonybin.net>) 
    46 
    572005-07-07 Bart Vanbrabant <bart.vanbrabant at zoeloelip.be> 
  • eaccelerator/trunk/eaccelerator.c

    r116 r119  
    17681768} 
    17691769 
    1770 static void __attribute__((destructor)) eaccelerator_clean_shutdown(void) { 
     1770#if (__GNUC__ >= 3) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 91)) 
     1771static void __attribute__((destructor)) eaccelerator_clean_shutdown(void) 
     1772#else 
     1773void _fini(void) 
     1774#endif 
     1775
    17711776  if (eaccelerator_mm_instance != NULL) { 
    17721777    TSRMLS_FETCH(); 
     
    19681973#endif 
    19691974#endif 
    1970  
    1971 #ifndef HAS_ATTRIBUTE 
    1972     atexit(eaccelerator_clean_shutdown); 
    1973 #endif 
    19741975  } 
    19751976#if defined(WITH_EACCELERATOR_SESSIONS) && defined(HAVE_PHP_SESSIONS_SUPPORT) 
    1976     if (!eaccelerator_session_registered()) { 
     1977  if (!eaccelerator_session_registered()) { 
    19771978      eaccelerator_register_session(); 
    1978    
     1979 
    19791980#endif 
    19801981#ifdef WITH_EACCELERATOR_CONTENT_CACHING 
    1981     eaccelerator_content_cache_startup(); 
     1982  eaccelerator_content_cache_startup(); 
    19821983#endif 
    19831984  if (!eaccelerator_is_zend_extension) { 
  • eaccelerator/trunk/eaccelerator.h

    r116 r119  
    3636#include "zend_API.h" 
    3737#include "zend_extensions.h" 
    38  
    39 /* Handle __attribute__ for nongcc compilers */ 
    40 #if (__GNUC__ >= 3)  || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 95)) 
    41 #  define HAS_ATTRIBUTE 
    42 #else 
    43 #  define __attribute__(x) 
    44 #endif 
    4538 
    4639#if !defined(ZEND_WIN32) && defined(HAVE_CONFIG_H)