← Back to branch summary

~yshurik/libmemcached/libmemcached-win

« back to all changes in this revision

Viewing changes to clients/utilities.cc

  • Committer: Continuous Integration
  • Date: 2013-04-03 13:16:24 UTC
  • mfrom: (1100.1.1 libmemcached-1.2)
  • Revision ID: ci@tangent.org-20130403131624-j59dhv5z5l0lsdld
Merge lp:~tangent-org/libmemcached/1.2-build/ Build: jenkins-Libmemcached-250

Show diffs side-by-side

added added

removed removed

Lines of Context:
clients/utilities.cc
144
144
  memcached_return_t rc;
145
145
 
146
146
  if (opt_hash == NULL)
 
147
  {
147
148
    return;
 
149
  }
148
150
 
149
151
  set= MEMCACHED_HASH_DEFAULT; /* Just here to solve warning */
150
152
  if (!strcasecmp(opt_hash, "CRC"))
184
186
void initialize_sockets(void)
185
187
{
186
188
  /* Define the function for all platforms to avoid #ifdefs in each program */
187
 
#if defined(WIN32) && WIN32
 
189
#if defined(_WIN32)
188
190
  WSADATA wsaData;
189
191
  if (WSAStartup(MAKEWORD(2,0), &wsaData) != 0)
190
192
  {
191
193
    fprintf(stderr, "Socket Initialization Error. Program aborted\n");
192
194
    exit(EXIT_FAILURE);
193
195
  }
194
 
#endif
 
196
#endif // #if defined(_WIN32)
195
197
}