Merge branch 'upstream' of git.debian.org:/git/collab-maint/smartmontools into upstream

[mirror_smartmontools-debian.git] / smartd.cpp

diff --git a/smartd.cpp b/smartd.cpp
index 99e0c23762a3cc8daaf686a28fae584a0cf9dacb..588e1f485daa7527c673c98e27a66806b80efbe6 100644 (file)
--- a/smartd.cpp
+++ b/smartd.cpp
@@ -5,6 +5,10 @@
  * Copyright (C) 2008-16 Christian Franke
  * Copyright (C) 2000    Michael Cornwell <cornwell@acm.org>
  * Copyright (C) 2008    Oliver Bock <brevilo@users.sourceforge.net>
+<<<<<<< HEAD
+=======
+ * Copyright (C) 2008-15 Christian Franke <smartmontools-support@lists.sourceforge.net>
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
  *
  * 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
@@ -100,7 +104,15 @@ typedef int pid_t;
 #define SIGQUIT_KEYNAME "CONTROL-\\"
 #endif // _WIN32
 
+<<<<<<< HEAD
 const char * smartd_cpp_cvsid = "$Id: smartd.cpp 4308 2016-04-24 13:36:10Z chrfranke $"
+=======
+#if defined (__SVR4) && defined (__sun)
+extern "C" int getdomainname(char *, int); // no declaration in header files!
+#endif
+
+const char * smartd_cpp_cvsid = "$Id: smartd.cpp 4059 2015-04-18 17:01:31Z chrfranke $"
+>>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
   CONFIG_H_CVSID;
 
 using namespace smartmontools;