diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-12 15:33:46 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-12 15:33:46 +0000 |
| commit | 22ea2706f0a9767d9910522868cc90f121cfc6fa (patch) | |
| tree | 8e175971996f5200b1b886a542d117a2e694d129 | |
| parent | 79cb8649ce5c13def3ba0d256ca84d46a0ccfc3d (diff) | |
| download | hercules-22ea2706f0a9767d9910522868cc90f121cfc6fa.tar.gz hercules-22ea2706f0a9767d9910522868cc90f121cfc6fa.tar.bz2 hercules-22ea2706f0a9767d9910522868cc90f121cfc6fa.tar.xz hercules-22ea2706f0a9767d9910522868cc90f121cfc6fa.zip | |
- Added svn:eol-style=native property on some recently added text files.
- Fixed a typo in script_commands.txt (bugreport:5998)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16278 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | 3rdparty/libconfig/Makefile.in | 52 | ||||
| -rw-r--r-- | doc/script_commands.txt | 4 | ||||
| -rw-r--r-- | src/common/evdp_epoll.c | 1 | ||||
| -rw-r--r-- | src/common/network.c | 3 |
4 files changed, 29 insertions, 31 deletions
diff --git a/3rdparty/libconfig/Makefile.in b/3rdparty/libconfig/Makefile.in index b0fa9a314..ee17298b4 100644 --- a/3rdparty/libconfig/Makefile.in +++ b/3rdparty/libconfig/Makefile.in @@ -1,26 +1,26 @@ -
-LIBCONFIG_OBJ = libconfig.o grammar.o scanctx.o scanner.o strbuf.o
-LIBCONFIG_H = libconfig.h grammar.h parsectx.h scanctx.h scanner.h strbuf.h wincompat.h
-
-@SET_MAKE@
-
-#####################################################################
-.PHONY : all clean help
-
-all: $(LIBCONFIG_OBJ)
-
-clean:
- @echo " CLEAN libconfig"
- @rm -rf *.o
-
-help:
- @echo "possible targets are 'all' 'clean' 'help'"
- @echo "'all' - builds $(LIBCONFIG_OBJ)"
- @echo "'clean' - deletes $(LIBCONFIG_OBJ)"
- @echo "'help' - outputs this message"
-
-#####################################################################
-
-%.o: %.c $(LIBCONFIG_H)
- @echo " CC $<"
- @@CC@ @CFLAGS@ @DEFS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+ +LIBCONFIG_OBJ = libconfig.o grammar.o scanctx.o scanner.o strbuf.o +LIBCONFIG_H = libconfig.h grammar.h parsectx.h scanctx.h scanner.h strbuf.h wincompat.h + +@SET_MAKE@ + +##################################################################### +.PHONY : all clean help + +all: $(LIBCONFIG_OBJ) + +clean: + @echo " CLEAN libconfig" + @rm -rf *.o + +help: + @echo "possible targets are 'all' 'clean' 'help'" + @echo "'all' - builds $(LIBCONFIG_OBJ)" + @echo "'clean' - deletes $(LIBCONFIG_OBJ)" + @echo "'help' - outputs this message" + +##################################################################### + +%.o: %.c $(LIBCONFIG_H) + @echo " CC $<" + @@CC@ @CFLAGS@ @DEFS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< diff --git a/doc/script_commands.txt b/doc/script_commands.txt index adae3726f..6e6c9127f 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -6706,12 +6706,12 @@ The first letter is position 0. Returns the original string with the specified char inserted at the specified index. If index is out of range, the char - will be inserted on the end of the string that it is closest. + will be inserted on the end of the string that it is closest. Only the 1st char in the <char> parameter will be used. Example: - setchar("laughter", "s", 0); //returns "slaughter" + insertchar("laughter", "s", 0); //returns "slaughter" --------------------------------------- diff --git a/src/common/evdp_epoll.c b/src/common/evdp_epoll.c index d71c8d4d7..0357dfc66 100644 --- a/src/common/evdp_epoll.c +++ b/src/common/evdp_epoll.c @@ -230,4 +230,3 @@ void evdp_writable_remove(int32 fd, EVDP_DATA *ep){ return; }//end: evdp_writable_remove() - diff --git a/src/common/network.c b/src/common/network.c index 2574f3cc1..1f1621363 100644 --- a/src/common/network.c +++ b/src/common/network.c @@ -1,4 +1,4 @@ - // +// // Network Subsystem (previously known as socket system) // // Author: Florian Wilkemeyer <fw@f-ws.de> @@ -1059,4 +1059,3 @@ void network_parser_set_ro(int32 fd, // }//end: network_parser_set_ro() - |