X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsn-merge.c;h=fbd5090735c2a6e15dc127e06333d80c989758aa;hb=8764b3122abba9e60cacb591f16a5e71abb5155f;hp=4649389d174bb6fa52791ddf4647c9a5fd5c67ed;hpb=02dd5a8e9890f7b16b950db238eeff42a57e9142;p=sort-networks.git

diff --git a/src/sn-merge.c b/src/sn-merge.c
index 4649389..fbd5090 100644
--- a/src/sn-merge.c
+++ b/src/sn-merge.c
@@ -1,3 +1,31 @@
+/**
+ * libsortnetwork - src/sn-merge.c
+ * Copyright (C) 2008-2010  Florian octo Forster
+ *
+ * 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; only version 2 of the License is applicable.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * Authors:
+ *   Florian octo Forster <ff at octo.it>
+ **/
+
+#ifndef _ISOC99_SOURCE
+# define _ISOC99_SOURCE
+#endif
+#ifndef _POSIX_C_SOURCE
+# define _POSIX_C_SOURCE 200112L
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -32,7 +60,7 @@ int main (int argc, char **argv)
     return (1);
   }
 
-  n = sn_network_combine (n0, n1);
+  n = sn_network_combine (n0, n1, /* is power of two = */ 0);
   sn_network_destroy (n0);
   sn_network_destroy (n1);