summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/Makefile.am1
-rw-r--r--client/mem.cpp24
-rw-r--r--client/windows/redc.vcproj4
-rw-r--r--client/x11/Makefile.am1
4 files changed, 30 insertions, 0 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index d01d03c9..887c7b5a 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -46,6 +46,7 @@ RED_COMMON_SRCS = \
lz.cpp \
monitor.cpp \
monitor.h \
+ mem.cpp \
menu.cpp \
menu.h \
pixels_source.h \
diff --git a/client/mem.cpp b/client/mem.cpp
new file mode 100644
index 00000000..b06bb3b6
--- /dev/null
+++ b/client/mem.cpp
@@ -0,0 +1,24 @@
+/*
+ Copyright (C) 2009 Red Hat, Inc.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "common.h"
+#include "utils.h"
+
+#define MALLOC_ERROR(format, ...) THROW(format, ## __VA_ARGS__)
+
+#include "../common/mem.c"
+
diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj
index e7c2e150..214a88df 100644
--- a/client/windows/redc.vcproj
+++ b/client/windows/redc.vcproj
@@ -265,6 +265,10 @@
>
</File>
<File
+ RelativePath="..\mem.cpp"
+ >
+ </File>
+ <File
RelativePath="..\menu.cpp"
>
</File>
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 7feedeaa..e2f5c21a 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -69,6 +69,7 @@ RED_COMMON_SRCS = \
$(top_srcdir)/client/lines.cpp \
$(top_srcdir)/client/monitor.cpp \
$(top_srcdir)/client/monitor.h \
+ $(top_srcdir)/client/mem.cpp \
$(top_srcdir)/client/menu.cpp \
$(top_srcdir)/client/menu.h \
$(top_srcdir)/client/pixels_source.h \