Changeset 1724


Ignore:
Timestamp:
02/26/10 19:12:12 (11 years ago)
Author:
merek
Message:

Some fixes for merge from UMP r1793

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/globals.h

    r1723 r1724  
    306306    /** maximum packet size. Needed for filtering modem status bytes every n packets. */
    307307    unsigned int max_packet_size;
    308     unsigned char g_read_buffer[4096]; 
    309     unsigned int g_read_buffer_size; 
    310     pthread_mutex_t g_read_mutex; 
    311     pthread_mutex_t g_usb_mutex; 
    312     pthread_t rt; 
    313     unsigned char modem_status; 
     308    unsigned char g_read_buffer[4096];
     309    unsigned int g_read_buffer_size;
     310    pthread_mutex_t g_read_mutex;
     311    pthread_mutex_t g_usb_mutex;
     312    pthread_t rt;
     313    unsigned char modem_status;
    314314} SR_CONFIG;
    315315#endif
  • trunk/oscam.c

    r1722 r1724  
    10621062static void init_service(int srv)
    10631063{
    1064 #ifdef USE_PTHREAD
    1065    uchar dummy[1]={0x00};
    1066 #endif
    1067 
    10681064  switch(cs_fork(0, srv))
    10691065  {
Note: See TracChangeset for help on using the changeset viewer.