Changeset 49

Show
Ignore:
Timestamp:
12/28/04 00:15:15 (4 years ago)
Author:
everaldo_canuto
Message:

Move encoder version information to eaccelerator.h, today this information are in two places, encoder.h and loader.h now it is unified.

Files:

Legend:

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

    r48 r49  
     12004-12-27  Everaldo Canuto <everaldo_canuto at yahoo.com.br> 
     2 
     3        * Move encoder version information to eaccelerator.h, today 
     4        this information are in two places, encoder.h and loader.h 
     5        now it is unified. 
     6 
    172004-12-27  Reiner Jung <r.jung at think-e.com.br> 
    28 
  • eaccelerator/trunk/eaccelerator.h

    r35 r49  
    192192 
    193193#define EACCELERATOR_EXTENSION_NAME "eAccelerator" 
    194 #define EACCELERATOR_LOADER_EXTENSION_NAME "Turck Loader" 
     194#define EACCELERATOR_LOADER_EXTENSION_NAME "eLoader" 
     195 
     196#define MMC_ENCODER_VERSION   0x00000003 
     197#define MMC_ENCODER_END       0x00 
     198#define MMC_ENCODER_NAMESPACE 0x01 
     199#define MMC_ENCODER_CLASS     0x02 
     200#define MMC_ENCODER_FUNCTION  0x03 
    195201 
    196202#endif /*#ifndef INCLUDED_EACCELERATOR_H*/ 
  • eaccelerator/trunk/encoder.c

    r44 r49  
    3535 
    3636#include "opcodes.h" 
    37  
    3837#include "zend.h" 
    3938#include "zend_API.h" 
    4039#include "php.h" 
    41  
    4240#include <math.h> 
    43  
    44 #define MMC_ENCODER_VERSION   0x00000003 
    45  
    46 #define MMC_ENCODER_END       0x00 
    47 #define MMC_ENCODER_NAMESPACE 0x01 
    48 #define MMC_ENCODER_CLASS     0x02 
    49 #define MMC_ENCODER_FUNCTION  0x03 
    5041 
    5142#ifndef WITHOUT_FILE_FILTER 
  • eaccelerator/trunk/loader.c

    r44 r49  
    3535 
    3636#include "opcodes.h" 
    37  
    3837#include "zend.h" 
    3938#include "zend_API.h" 
    4039#include "php.h" 
    41  
    4240#include <math.h> 
    43  
    44 #define MMC_ENCODER_VERSION   0x00000002 
    45 #define MMC_ENCODER_END       0x00 
    46 #define MMC_ENCODER_NAMESPACE 0x01 
    47 #define MMC_ENCODER_CLASS     0x02 
    48 #define MMC_ENCODER_FUNCTION  0x03 
    4941 
    5042typedef struct loader_data { 
     
    10511043            } else { 
    10521044              error_reported = 1; 
    1053               zend_error(E_ERROR, "MMCache Loader can't load code. Icorrect Zend Engine version"); 
     1045              zend_error(E_ERROR, "eAccelerator Loader can't load code. Icorrect Zend Engine version"); 
    10541046            } 
    10551047          } else { 
    10561048            error_reported = 1; 
    1057             zend_error(E_ERROR, "MMCache Loader can't load code. Icorrect MMCache encoder version (%u)", v); 
     1049            zend_error(E_ERROR, "eAccelerator Loader can't load code. Icorrect eAccelerator encoder version (%u)", v); 
    10581050          } 
    10591051        } else { 
    10601052          error_reported = 1; 
    1061           zend_error(E_ERROR, "MMCache Loader can't load code. Icorrect code"); 
     1053          zend_error(E_ERROR, "eAccelerator Loader can't load code. Icorrect code"); 
    10621054        } 
    10631055      } zend_catch {