Commit 3d746499 authored by Yang Tse's avatar Yang Tse
Browse files

avoid inclusion of setup.h in util.h

parent ed63d9d4

tests/server/util.c

+3 −3
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ int wait_ms(int timeout_ms) 
  return r;

}



bool write_pidfile(const char *filename)

int write_pidfile(const char *filename)

{

  FILE *pidfile;

  long pid;
@@ -227,10 +227,10 @@ bool write_pidfile(const char *filename) 
  pidfile = fopen(filename, "w");

  if(!pidfile) {

    logmsg("Couldn't write pid file: %s %s", filename, strerror(ERRNO));

    return FALSE;

    return 0; /* fail */

  }

  fprintf(pidfile, "%ld\n", pid);

  fclose(pidfile);

  logmsg("Wrote pid %ld to %s", pid, filename);

  return TRUE;

  return 1; /* success */

}

tests/server/util.h

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
 *

 * $Id$

 ***************************************************************************/

#include "setup.h" /* portability help from the lib directory */



void logmsg(const char *msg, ...);
@@ -52,6 +51,6 @@ char *test2file(long testno); 


int wait_ms(int timeout_ms);



bool write_pidfile(const char *filename);

int write_pidfile(const char *filename);



#endif  /* __SERVER_UTIL_H */