← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/common.h

  • Committer: Mark Atwood
  • Date: 2011-12-30 22:59:59 UTC
  • mfrom: (2478.1.3 drizzle-build)
  • Revision ID: me@mark.atwood.name-20111230225959-m3wdvqiymv3a4q2w
merge lp:~brianaker/drizzle/yacc-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/common.h
41
41
 
42
42
#pragma once
43
43
 
44
 
#include <config.h>
45
 
 
46
 
#include "libdrizzle-1.0/drizzle_client.h"
47
 
#include "libdrizzle-1.0/drizzle_server.h"
48
 
 
49
 
#include <assert.h>
50
 
#include <errno.h>
 
44
#include "config.h"
 
45
 
 
46
#include <libdrizzle-1.0/drizzle_client.h>
 
47
#include <libdrizzle-1.0/drizzle_server.h>
 
48
 
 
49
#include <cassert>
 
50
#include <cerrno>
 
51
 
51
52
#include <fcntl.h>
52
53
#ifndef _WIN32
53
54
# include <netinet/tcp.h>
54
55
# include <sys/uio.h>
55
56
# include <unistd.h>
56
57
#endif
57
 
#include <stdarg.h>
58
 
#include <stdio.h>
59
 
#include <stdlib.h>
60
 
#include <string.h>
 
58
 
 
59
#include <cstddef>
 
60
#include <cstdarg>
 
61
#include <cstdio>
 
62
#include <cstdlib>
 
63
#include <cstring>
61
64
#include <signal.h>
62
65
 
63
 
#include <libdrizzle-1.0/drizzle_local.h>
64
 
#include <libdrizzle-1.0/conn_local.h>
65
 
#include <libdrizzle-1.0/pack.h>
66
 
#include <libdrizzle-1.0/state.h>
67
 
#include <libdrizzle-1.0/sha1.h>
 
66
#include <libdrizzle/drizzle_local.h>
 
67
#include <libdrizzle/conn_local.h>
 
68
#include <libdrizzle/pack.h>
 
69
#include <libdrizzle/state.h>
 
70
#include <libdrizzle/sha1.h>
68
71
 
69
72
#include <memory>