Commit e9af959e authored by unknown's avatar unknown
Browse files

make the IM compile on Windows 


server-tools/instance-manager/instance_options.cc:
  fix for coding guidelines
server-tools/instance-manager/parse_output.cc:
  fix for coding guidelines
server-tools/instance-manager/priv.cc:
  don't call pthread_attr_setstacksize on Windows
server-tools/instance-manager/priv.h:
  include my_pthread so the thread functions will compile on Windows
parent 5ce36e81

server-tools/instance-manager/priv.cc

+3 −2
Original line number Diff line number Diff line
@@ -73,8 +73,9 @@ unsigned long open_files_limit; 
int set_stacksize_n_create_thread(pthread_t  *thread, pthread_attr_t *attr,

                                  void *(*start_routine)(void *), void *arg)

{

  int rc;

  int rc= 0;



#ifndef __WIN__

  /*

    Set stack size to be safe on the platforms with too small

    default thread stack.
@@ -82,7 +83,7 @@ int set_stacksize_n_create_thread(pthread_t *thread, pthread_attr_t *attr, 
  rc= pthread_attr_setstacksize(attr,

                                (size_t) (PTHREAD_STACK_MIN +

                                          IM_THREAD_STACK_SIZE));



#endif

  if (!rc)

    rc= pthread_create(thread, attr, start_routine, arg);

  return rc;

server-tools/instance-manager/priv.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#else

#include <unistd.h>

#endif



#include "my_pthread.h"



/* the pid of the manager process (of the signal thread on the LinuxThreads) */

extern pid_t manager_pid;

server-tools/instance-manager/instance_options.cc

+1 −1

File changed.

Contains only whitespace changes.

server-tools/instance-manager/parse_output.cc

+2 −2

File changed.

Contains only whitespace changes.