new_server_clnt.h -> include/ejudge/new_server_clnt.h

super_clnt.h -> include/ejudge/super_clnt.h userlist_clnt.h -> include/ejudge/userlist_clnt.h
blackav · May 17, 2014 · e474e45 · e474e45
1 parent d22443e
commit e474e45
Show file tree

Hide file tree

Showing 44 changed files with 45 additions and 45 deletions.
diff --git a/clean-users.c b/clean-users.c
@@ -24,7 +24,7 @@
 #include "ejudge/errlog.h"
 #include "ejudge/runlog.h"
 #include "ejudge/clarlog.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist_proto.h"
 #include "ejudge/serve_state.h"
 

diff --git a/csp/contests/I_priv_ip_users_page.c b/csp/contests/I_priv_ip_users_page.c
@@ -18,7 +18,7 @@
 #include "new_server_pi.h"
 #include "new-server.h"
 #include "ejudge/contests.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/runlog.h"
 #include "ejudge/xml_utils.h"
 

diff --git a/csp/contests/I_priv_priv_users_page.c b/csp/contests/I_priv_priv_users_page.c
@@ -18,7 +18,7 @@
 #include "new_server_pi.h"
 #include "new-server.h"
 #include "ejudge/contests.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 
 #include "reuse/xalloc.h"
 #include "reuse/logger.h"

diff --git a/csp/contests/I_priv_user_ips_page.c b/csp/contests/I_priv_user_ips_page.c
@@ -19,7 +19,7 @@
 #include "new-server.h"
 #include "new_server_pi.h"
 #include "ejudge/contests.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/runlog.h"
 #include "ejudge/xml_utils.h"
 

diff --git a/csp/contests/priv_users_page.csp b/csp/contests/priv_users_page.csp
@@ -2,7 +2,7 @@
 /* $Id$ */
 %><%@include "priv_includes.csp"
 %><%
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist_proto.h"
 %><%@set getter_name = "csp_get_priv_users_page"
 %><%@set ac_prefix = "NEW_SRV_ACTION_"

diff --git a/csp/contests/reg_create_page.csp b/csp/contests/reg_create_page.csp
@@ -3,7 +3,7 @@
 %><%@include "reg_includes.csp"
 %><%
 #include "ejudge/ejudge_cfg.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist_proto.h"
 %><%@set ac_prefix = "NEW_SRV_ACTION_"
 %><%@set err_prefix = "NEW_SRV_ERR_"

diff --git a/csp/contests/unpriv_recover_2_page.csp b/csp/contests/unpriv_recover_2_page.csp
@@ -2,7 +2,7 @@
 /* $Id$ */
 %><%@include "unpriv_includes.csp"
 %><%
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist_proto.h"
 %><%@set ac_prefix = "NEW_SRV_ACTION_"
 %><%@set err_prefix = "NEW_SRV_ERR_"

diff --git a/csp/contests/unpriv_recover_3_page.csp b/csp/contests/unpriv_recover_3_page.csp
@@ -2,7 +2,7 @@
 /* $Id$ */
 %><%@include "unpriv_includes.csp"
 %><%
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist_proto.h"
 %><%@set ac_prefix = "NEW_SRV_ACTION_"
 %><%@set getter_name = "csp_get_unpriv_recover_3_page"

diff --git a/edit-userlist.c b/edit-userlist.c
@@ -17,7 +17,7 @@
 
 #include "ejudge/config.h"
 #include "ejudge/ej_types.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist_proto.h"
 #include "ejudge/contests.h"
 #include "ejudge/userlist.h"

diff --git a/files.make b/files.make
@@ -571,7 +571,7 @@ HFILES=\
  ./include/ejudge/sock_op.h\
  ./include/ejudge/startstop.h\
  ./include/ejudge/stringset.h\
- super_clnt.h\
+ ./include/ejudge/super_clnt.h\
  ./include/ejudge/super_html.h\
  ./include/ejudge/super_proto.h\
  ./include/ejudge/super_run_packet.h\
@@ -592,15 +592,15 @@ HFILES=\
  ./include/ejudge/type_info.h\
  ./include/ejudge/uldb_plugin.h\
  ./include/ejudge/userlist.h\
- userlist_clnt.h\
+ ./include/ejudge/userlist_clnt.h\
  ./include/ejudge/varsubst.h\
  ./include/ejudge/vcs.h\
  ./include/ejudge/version.h\
  ./include/ejudge/watched_file.h\
  ./include/ejudge/win32_compat.h\
  unix/unix_fileutl.h\
  userlist_clnt/private.h\
- new_server_clnt.h\
+ ./include/ejudge/new_server_clnt.h\
  ./include/ejudge/new_server_proto.h\
  new_server_clnt/new_server_clnt_priv.h\
  ./include/ejudge/xml_utils.h\

diff --git a/new_server_clnt.h → include/ejudge/new_server_clnt.h b/new_server_clnt.h → include/ejudge/new_server_clnt.h
diff --git a/super_clnt.h → include/ejudge/super_clnt.h b/super_clnt.h → include/ejudge/super_clnt.h
diff --git a/userlist_clnt.h → include/ejudge/userlist_clnt.h b/userlist_clnt.h → include/ejudge/userlist_clnt.h
diff --git a/new-client.c b/new-client.c
@@ -18,7 +18,7 @@
 #include "ejudge/config.h"
 #include "ejudge/ej_types.h"
 #include "ejudge/new_server_proto.h"
-#include "new_server_clnt.h"
+#include "ejudge/new_server_clnt.h"
 #include "ejudge/pathutl.h"
 #include "ejudge/cgi.h"
 #include "ejudge/clntutil.h"

diff --git a/new-server-cmd.c b/new-server-cmd.c
@@ -22,7 +22,7 @@
 #include "ejudge/contests.h"
 #include "ejudge/pathutl.h"
 #include "ejudge/xml_utils.h"
-#include "new_server_clnt.h"
+#include "ejudge/new_server_clnt.h"
 #include "new-server.h"
 #include "ejudge/new_server_proto.h"
 

diff --git a/new-server-control.c b/new-server-control.c
@@ -20,7 +20,7 @@
 #include "ejudge/version.h"
 #include "ejudge/ejudge_cfg.h"
 #include "ejudge/new_server_proto.h"
-#include "new_server_clnt.h"
+#include "ejudge/new_server_clnt.h"
 #include "ejudge/startstop.h"
 
 #include "reuse/xalloc.h"

diff --git a/new_server_clnt/new_server_clnt_priv.h b/new_server_clnt/new_server_clnt_priv.h
@@ -4,7 +4,7 @@
 #ifndef __NEW_SERVER_CLNT_PRIV_H__
 #define __NEW_SERVER_CLNT_PRIV_H__
 
-/* Copyright (C) 2006 Alexander Chernov <cher@ejudge.ru> */
+/* Copyright (C) 2006-2014 Alexander Chernov <cher@ejudge.ru> */
 
 /*
  * This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "new_server_clnt.h"
+#include "ejudge/new_server_clnt.h"
 
 struct new_server_conn
 {

diff --git a/new_server_html.c b/new_server_html.c
@@ -24,7 +24,7 @@
 #include "ejudge/xml_utils.h"
 #include "ejudge/misctext.h"
 #include "ejudge/copyright.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/ejudge_cfg.h"
 #include "ejudge/errlog.h"
 #include "ejudge/userlist_proto.h"

diff --git a/new_server_html_2.c b/new_server_html_2.c
@@ -42,7 +42,7 @@
 #include "ejudge/csv.h"
 #include "ejudge/sha.h"
 #include "ejudge/sformat.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/charsets.h"
 #include "ejudge/compat.h"
 #include "ejudge/run_packet.h"

diff --git a/new_server_html_4.c b/new_server_html_4.c
@@ -23,7 +23,7 @@
 #include "ejudge/contests.h"
 #include "ejudge/userlist.h"
 #include "ejudge/userlist_proto.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/runlog.h"
 #include "ejudge/html.h"
 #include "ejudge/prepare.h"

diff --git a/new_server_html_5.c b/new_server_html_5.c
@@ -20,7 +20,7 @@
 #include "ejudge/ej_limits.h"
 #include "new-server.h"
 #include "ejudge/new_server_proto.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist_proto.h"
 #include "ejudge/userlist.h"
 #include "ejudge/contests.h"

diff --git a/python/ejudgemodule.c b/python/ejudgemodule.c
@@ -18,7 +18,7 @@
 #include <Python.h>
 
 #include "ejudge/config.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist_proto.h"
 #include "ejudge/userlist.h"
 #include "ejudge/xml_utils.h"

diff --git a/serve-control.c b/serve-control.c
@@ -23,11 +23,11 @@
 #include "ejudge/pathutl.h"
 #include "ejudge/clntutil.h"
 #include "ejudge/contests.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/cgi.h"
 #include "ejudge/userlist.h"
 #include "ejudge/userlist_proto.h"
-#include "super_clnt.h"
+#include "ejudge/super_clnt.h"
 #include "ejudge/super_proto.h"
 #include "ejudge/compat.h"
 

diff --git a/serve_state.c b/serve_state.c
@@ -25,7 +25,7 @@
 #include "ejudge/pathutl.h"
 #include "ejudge/errlog.h"
 #include "ejudge/userlist_proto.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/ejudge_plugin.h"
 #include "ejudge/csv.h"
 #include "ejudge/ejudge_cfg.h"

diff --git a/super-serve-control.c b/super-serve-control.c
@@ -20,7 +20,7 @@
 #include "ejudge/version.h"
 #include "ejudge/ejudge_cfg.h"
 #include "ejudge/super_proto.h"
-#include "super_clnt.h"
+#include "ejudge/super_clnt.h"
 #include "ejudge/startstop.h"
 
 #include "reuse/osdeps.h"

diff --git a/super-serve.c b/super-serve.c
@@ -22,7 +22,7 @@
 #include "ejudge/contests.h"
 #include "ejudge/pathutl.h"
 #include "ejudge/errlog.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/super_proto.h"
 #include "ejudge/userlist_proto.h"
 #include "ejudge/misctext.h"

diff --git a/super_clnt/control.c b/super_clnt/control.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include "super_clnt.h"
+#include "ejudge/super_clnt.h"
 #include "ejudge/super_proto.h"
 
 #include <stdlib.h>

diff --git a/super_clnt/create_contest.c b/super_clnt/create_contest.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include "super_clnt.h"
+#include "ejudge/super_clnt.h"
 #include "ejudge/super_proto.h"
 #include "ejudge/errlog.h"
 

diff --git a/super_clnt/do_pass_fd.c b/super_clnt/do_pass_fd.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include "super_clnt.h"
+#include "ejudge/super_clnt.h"
 #include "ejudge/super_proto.h"
 #include "ejudge/sock_op.h"
 #include "ejudge/errlog.h"

diff --git a/super_clnt/http_request.c b/super_clnt/http_request.c
@@ -16,7 +16,7 @@
  */
 
 #include "ejudge/ej_types.h"
-#include "super_clnt.h"
+#include "ejudge/super_clnt.h"
 #include "ejudge/super_proto.h"
 #include "ejudge/errlog.h"
 

diff --git a/super_clnt/main_page.c b/super_clnt/main_page.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include "super_clnt.h"
+#include "ejudge/super_clnt.h"
 #include "ejudge/super_proto.h"
 #include "ejudge/errlog.h"
 

diff --git a/super_clnt/open.c b/super_clnt/open.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include "super_clnt.h"
+#include "ejudge/super_clnt.h"
 #include "ejudge/super_proto.h"
 #include "ejudge/errlog.h"
 #include "ejudge/sock_op.h"

diff --git a/super_clnt/pass_fd.c b/super_clnt/pass_fd.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include "super_clnt.h"
+#include "ejudge/super_clnt.h"
 #include "ejudge/super_proto.h"
 
 #include <stdlib.h>

diff --git a/super_clnt/recv_packet.c b/super_clnt/recv_packet.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include "super_clnt.h"
+#include "ejudge/super_clnt.h"
 #include "ejudge/super_proto.h"
 #include "ejudge/errlog.h"
 

diff --git a/super_clnt/send_packet.c b/super_clnt/send_packet.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include "super_clnt.h"
+#include "ejudge/super_clnt.h"
 #include "ejudge/super_proto.h"
 #include "ejudge/errlog.h"
 

diff --git a/super_clnt/set_param.c b/super_clnt/set_param.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include "super_clnt.h"
+#include "ejudge/super_clnt.h"
 #include "ejudge/super_proto.h"
 #include "ejudge/errlog.h"
 

diff --git a/super_clnt/simple_cmd.c b/super_clnt/simple_cmd.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include "super_clnt.h"
+#include "ejudge/super_clnt.h"
 #include "ejudge/super_proto.h"
 #include "ejudge/errlog.h"
 

diff --git a/super_html_2.c b/super_html_2.c
@@ -32,7 +32,7 @@
 #include "ejudge/xml_utils.h"
 #include "ejudge/prepare.h"
 #include "ejudge/userlist_proto.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist.h"
 #include "ejudge/ej_process.h"
 #include "ejudge/vcs.h"

diff --git a/super_html_3.c b/super_html_3.c
@@ -30,7 +30,7 @@
 #include "ejudge/xml_utils.h"
 #include "ejudge/ej_process.h"
 #include "ejudge/cpu.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist_proto.h"
 #include "ejudge/userlist.h"
 #include "ejudge/prepare_serve.h"

diff --git a/super_html_6.c b/super_html_6.c
@@ -23,7 +23,7 @@
 #include "ejudge/super_proto.h"
 #include "ejudge/mischtml.h"
 #include "ejudge/userlist_proto.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist.h"
 #include "ejudge/misctext.h"
 #include "ejudge/errlog.h"

diff --git a/teamdb.c b/teamdb.c
@@ -20,7 +20,7 @@
 #include "ejudge/pathutl.h"
 #include "ejudge/errlog.h"
 #include "ejudge/base64.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist_proto.h"
 #include "ejudge/userlist.h"
 #include "ejudge/xml_utils.h"

diff --git a/userlist-server-control.c b/userlist-server-control.c
@@ -19,7 +19,7 @@
 #include "ejudge/ej_types.h"
 #include "ejudge/version.h"
 #include "ejudge/ejudge_cfg.h"
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist_proto.h"
 #include "ejudge/startstop.h"
 

diff --git a/userlist_clnt/private.h b/userlist_clnt/private.h
@@ -22,7 +22,7 @@
 #include <Python.h>
 #endif
 
-#include "userlist_clnt.h"
+#include "ejudge/userlist_clnt.h"
 #include "ejudge/userlist_proto.h"
 #include "ejudge/pathutl.h"