← Back to branch summary

~evarlast/ubuntu/utopic/mongodb/upstart-workaround-debian-bug-718702

« back to all changes in this revision

Viewing changes to src/mongo/platform/windows_basic.h

  • Committer: Package Import Robot
  • Author(s): James Page, James Page, Robie Basak
  • Date: 2013-05-29 17:44:42 UTC
  • mfrom: (44.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20130529174442-z0a4qmoww4y0t458
Tags: 1:2.4.3-1ubuntu1
[ James Page ]
* Merge from Debian unstable, remaining changes:
  - Enable SSL support:
    + d/control: Add libssl-dev to BD's.
    + d/rules: Enabled --ssl option.
    + d/mongodb.conf: Add example SSL configuration options.
  - d/mongodb-server.mongodb.upstart: Add upstart configuration.
  - d/rules: Don't strip binaries during scons build for Ubuntu.
  - d/control: Add armhf to target archs.
  - d/p/SConscript.client.patch: fixup install of client libraries.
  - d/p/0010-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch:
    Install libraries to lib not lib64.
* Dropped changes:
  - d/p/arm-support.patch: Included in Debian.
  - d/p/double-alignment.patch: Included in Debian.
  - d/rules,control: Debian also builds with avaliable system libraries
    now.
* Fix FTBFS due to gcc and boost upgrades in saucy:
  - d/p/0008-ignore-unused-local-typedefs.patch: Add -Wno-unused-typedefs
    to unbreak building with g++-4.8.
  - d/p/0009-boost-1.53.patch: Fixup signed/unsigned casting issue.

[ Robie Basak ]
* d/p/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch: Fixup
  build failure on ARM due to missing signed'ness of char cast.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mongo/platform/windows_basic.h
1
1
// windows_basic.h
2
2
 
 
3
/*
 
4
 *    Copyright 2010 10gen Inc.
 
5
 *
 
6
 *    Licensed under the Apache License, Version 2.0 (the "License");
 
7
 *    you may not use this file except in compliance with the License.
 
8
 *    You may obtain a copy of the License at
 
9
 *
 
10
 *    http://www.apache.org/licenses/LICENSE-2.0
 
11
 *
 
12
 *    Unless required by applicable law or agreed to in writing, software
 
13
 *    distributed under the License is distributed on an "AS IS" BASIS,
 
14
 *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
15
 *    See the License for the specific language governing permissions and
 
16
 *    limitations under the License.
 
17
 */
 
18
 
3
19
#pragma once
4
20
 
5
21
#if defined(_WIN32)
11
27
// tell windows.h not to include a bunch of headers we don't need:
12
28
# define WIN32_LEAN_AND_MEAN
13
29
# include "mongo/targetver.h"
 
30
 
14
31
# include <winsock2.h> //this must be included before the first windows.h include
15
32
# include <ws2tcpip.h>
16
33
# include <wspiapi.h>